X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=95eea7c77638dbd6e0d2a84013d84c376879e9b3;hb=6f46f49650b9cd2e651d475d7b8238be7887706f;hp=96bc8a0958c8bde4b64d503b579c9dbdaec208e2;hpb=56c8ec23cd587a012933d18ae65afa7636864314;p=debian%2Fgnuradio

diff --git a/debian/control b/debian/control
index 96bc8a09..95eea7c7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,19 @@ XS-Python-Version: >= 2.3
 
 Package: gnuradio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, gnuradio-doc, libgnuradio-core0-dev, libgnuradio-core0c2a, libgnuradio-core0c2a-dbg, usrp, usrp-firmware, libusrp0-dev, libusrp0c2a, libusrp0c2a-dbg, python-gnuradio, python-usrp, gnuradio-examples
-Conflicts: gr-audio-alsa, gr-audio-oss, gr-audio-jack, gr-wxgui
-Replaces: gr-audio-alsa, gr-audio-oss, gr-audio-jack, gr-wxgui
+Section: comm
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, gnuradio-doc, libgnuradio-core0-dev, libgnuradio-core0c2a, libgnuradio-core0c2a-dbg, python-gnuradio (= ${Source-Version}), gnuradio-examples
+Suggests: usrp
+Conflicts: gr-audio-alsa, gr-audio-oss, gr-audio-jack
+Replaces: gr-audio-alsa, gr-audio-oss, gr-audio-jack
 XB-Python-Version: ${python:Versions}
 Description: Software Defined Radio
  This is a meta-package that depends on the various components of a complete
  installation of the GNU Radio softare defined radio system.
+ .
+ If you have a USRP, you probably also want to install the usrp package as
+ suggested, which lives in contrib because the FPGA bitstrings require 
+ non-free tools to build.
 
 Package: gnuradio-doc
 Section: doc
@@ -60,8 +66,8 @@ Description: Software Defined Radio
 Package: usrp
 Section: contrib/comm
 Architecture: any
-Depends: ${shlibs:Depends}, python
-Recommends: hotplug, usrp-firmware
+Depends: ${shlibs:Depends}, python, libusrp0-dev, libusrp0c2a-dbg, python-usrp (= ${Source-Version})
+Recommends: gnuradio, hotplug, usrp-firmware
 XB-Python-Version: ${python:Versions}
 Description: control applications and firmware for the USRP
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
@@ -69,15 +75,15 @@ Description: control applications and firmware for the USRP
  and digital-to-analog converters, an FPGA and a microcontroller. It's
  ideal for capturing or transmitting various signals, usually in
  combination with GNU Radio. The design schemas are available under a
- free license.
+ free license.  Visit ettus.com for more information on the USRP.
  .
  This package contains a tool for loading firmware and doing other
  simple administrative tasks for the USRP (usrper), as well as the
- actual firmware binaries for the microcontroller.
+ actual firmware binaries for the microcontroller.  
  .
- Note that this package does _not_ contain the FPGA bitstrings, which
- you will probably also want to get something useful out of the USRP.
- For that, see the package "usrp-firmware" in contrib.
+ This package also depends on all of the other USRP-related packages 
+ so that installing this package will pull in all the pieces you might 
+ want or need to successfully use the USRP with GNU Radio.
 
 Package: usrp-firmware
 Section: contrib/comm
@@ -129,6 +135,7 @@ Description: client side library for the USRP
  for communicating with the USRP.
 
 Package: libusrp0c2a-dbg
+Priority: extra
 Section: contrib/libdevel
 Architecture: any
 Depends: libusrp0c2a (= ${Source-Version}), ${shlibs:Depends}
@@ -146,15 +153,17 @@ Description: client side library debugging symbols for the USRP
 Package: python-gnuradio
 Architecture: any
 Depends: ${python:Depends}, libgnuradio-core0c2a, python-numeric
+Conflicts: gr-wxgui
+Replaces: gr-wxgui
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
-Description: Python bindings for GNURadio
+Description: Python bindings for GNU Radio
  This provides the module that enable one to use gnuradio from Python
  scripts.  You will need Python and gnuradio-dev installed to use this.
 
 Package: python-usrp
-Section: contrib/python
+Section: contrib/libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}
 Replaces: python2.3-usrp
@@ -175,7 +184,7 @@ Package: gnuradio-examples
 Architecture: all
 Depends: ${python:Depends}, libgnuradio-core0c2a, python-gnuradio
 XB-Python-Version: ${python:Versions}
-Description: Example programs to test and use GNURadio
+Description: Example programs to test and use GNU Radio
  This package contains Python programs which uses and tests
  the GNU Radio libraries. The examples include dialtone generation,
  complete FM receiver and many more exciting applications.