X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=c62298d1926defe66ac46a3846dcb90408131c45;hb=2924c0e740bbb9106bfed602345daaee5606d62a;hp=c6a0644dad541f291955a898c183722f0a0a6535;hpb=ea8558daa6d9afa7dea13fe0adf7acbac4e5d352;p=debian%2Fgnuradio

diff --git a/debian/control b/debian/control
index c6a0644d..c62298d1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,96 +1,299 @@
+################################################################################
+# Single source deb for entire distribution                                    #
+################################################################################
+
 Source: gnuradio
 Section: comm
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev, libasound2-dev, libboost-dev, libcppunit-dev, libjack0.100.0-dev, libsdl1.2-dev, portaudio19-dev, libtool, libusb-dev, pkg-config, python, python-all-dev, python-central (>= 0.5), python-numpy, python-wxgtk2.6, sdcc, swig, xmlto
-Build-Depends-Indep: python-all-dev
-Standards-Version: 3.7.2
-XS-Python-Version: >= 2.3
+Build-Depends: automake, debhelper (>= 5), doxygen-latex, ghostscript, guile-1.8, libasound2-dev, libaudio-dev, libblas-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libcppunit-dev, libfftw3-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libgsl0-dev, libjack-dev, libpng12-dev, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libsdl1.2-dev, libtool, libusb-dev, libwxgtk2.8-dev, libxext-dev, libxrender-dev, libxt-dev, pkg-config, portaudio19-dev, python-cheetah, python-dev, python-gtk2, python-lxml, python-numpy, python-qt4, python-qt4-dev, python-wxgtk2.8, sdcc, swig, xdg-utils, xmlto
+Standards-Version: 3.8.4
+XS-Python-Version: >=2.5
+Vcs-Git: git://git.gag.com/debian/gnuradio
+Vcs-Browser: http://git.gag.com/?p=debian/gnuradio
+
+################################################################################
+# C++ auxiliary libraries                                                      #
+################################################################################
+
+Package: libgruel0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GNU Radio Utility Etcetera Library
+ This package implements a variety of low-level utility
+ routines for GNU Radio.
+
+Package: libgruel-dev
+Section: libdevel
+Architecture: any
+Depends: libgruel0 (= ${binary:Version}), ${misc:Depends}
+Description: GNU Radio Utility Etcetera Library
+ This package implements a variety of low-level utility
+ routines for GNU Radio.
+ .
+ This package contains header files needed by developers.
 
-Package: libgnuradio-omnithread0c2a
+Package: libgromnithread0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Replaces: libgnuradio-omnithread0c2a
+Conflicts: libgnuradio-omnithread0c2a
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
 
-Package: libgnuradio-omnithread0-dev
+Package: libgromnithread-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-omnithread0c2a (= ${Source-Version})
+Replaces: libgnuradio-omnithread0-dev
+Conflicts: libgnuradio-omnithread0-dev
+Depends: libgromnithread0 (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
  .
  This package contains header files needed by developers.
 
-Package: libpmt0c2a
+Package: libpmt0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a
+Replaces: libpmt0c2a
+Conflicts: libpmt0c2a
+Depends: libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
  reference counting using the boost shared_ptr templates.
 
-Package: libpmt0-dev
+Package: libpmt-dev
 Section: libdevel
 Architecture: any
-Depends: libpmt0c2a (= ${Source-Version}), libgnuradio-omnithread0-dev, libboost-dev
+Replaces: libpmt0-dev
+Conflicts: libpmt0-dev
+Depends: libpmt0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
- to lisp or python data objects, and implement transparent
+ to lisp or Python data objects, and implement transparent
  reference counting using the boost shared_ptr templates.
  .
  This package contains header files needed by developers.
 
-Package: libmblock0c2a
-Section: libs
+################################################################################
+# C++ M-Block library packages                                                 #
+################################################################################
+
+Package: libmblock0
+Section: libs 
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a, libpmt0c2a
-Description: GNU Radio Message Block Library
- This package provides the GNU Radio message block library.
+Replaces: libmblock0c2a
+Conflicts: libmblock0c2a
+Depends: libpmt0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, guile-1.8, ${misc:Depends}
+Description: GNU Radio Message Block Library 
+ This package provides the GNU Radio message block library. 
 
-Package: libmblock0-dev
+Package: libmblock-dev
 Section: libdevel
 Architecture: any
-Depends: libmblock0c2a (= ${Source-Version}), libgnuradio-omnithread0-dev, libpmt0-dev
+Replaces: libmblock0-dev
+Conflicts: libmblock0-dev
+Depends: libmblock0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libpmt-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Message Block Library
  This package provides the GNU Radio message block library.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-core0c2a
+################################################################################
+# C++ USRP/USRP2 library packages                                              #
+################################################################################
+
+Package: libusrp0
+Section: comm
+Architecture: any
+Depends: ${shlibs:Depends}, adduser, ${misc:Depends}
+Replaces: libusrp0c2a, usrp-firmware
+Conflicts: usrp-firmware
+Suggests: usrp-doc
+Description: Client side library for the USRP(1) hardware
+ The Universal Software Radio Peripheral (USRP) is an USB-connected,
+ low-cost and open board. It features four high-speed analog-to-digital
+ 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.
+ .
+ This package contains the client-side library, providing an easy interface
+ for communicating with the USRP.
+
+Package: libusrp-dev
+Section: libdevel
+Architecture: any
+Replaces: libusrp0-dev
+Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread-dev, ${misc:Depends}
+Description: Client side library for the USRP(1) hardware
+ The Universal Software Radio Peripheral (USRP) is an USB-connected,
+ low-cost and open board. It features four high-speed analog-to-digital
+ 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.
+ .
+ This package contains the client-side library, providing an easy interface
+ for communicating with the USRP.
+ .
+ This package contains header files needed by developers.
+
+Package: libusrp2-0
+Section: comm
+Architecture: any
+Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, adduser, ${misc:Depends}
+Description: Client side library for the USRP2 hardware
+ The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
+ low-cost and open board. It features two high-speed analog-to-digital
+ 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.
+ .
+ This package contains the client-side C++ library, providing the low-
+ level (non-GNU Radio) hardware interface.
+
+Package: libusrp2-dev
+Section: libdevel
+Architecture: any
+Depends: libusrp2-0 (= ${binary:Version}), libboost-thread-dev, libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}), ${misc:Depends}
+Description: Client side library for the USRP2 hardware
+ The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
+ low-cost and open board. It features two high-speed analog-to-digital
+ 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.
+ .
+ This package contains the client-side C++ library, providing the low-
+ level (non-GNU Radio) hardware interface.
+ .
+ This package contains header files needed by developers.
+
+################################################################################
+# C++ GNU Radio block library packages                                         #
+################################################################################
+
+Package: libgnuradio-core0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a
-Conflicts:  libgnuradio-core0, libgnuradio-core0c2
-Replaces:  libgnuradio-core0, libgnuradio-core0c2
+Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts:  libgnuradio-core0c2, libgnuradio-core0c2a
+Replaces:  libgnuradio-core0c2, libgnuradio-core0c2a
 Suggests: gnuradio-doc
-Description: GNU Radio Core Library
+Description: The GNU Sofware Radio Core Library
  This package contains the core GNU Radio libraries.
 
-Package: libgnuradio-core0-dev
+Package: libgnuradio-core-dev
 Section: libdevel
-Architecture: any
-Depends: libgnuradio-core0c2a (= ${Source-Version}), libgnuradio-omnithread0-dev, libboost-dev, fftw3-dev
-Description: Software Defined Radio
+Architecture: any 
+Replaces: libgnuradio-core0-dev
+Conflicts: libgnuradio-core0-dev
+Depends: libgnuradio-core0 (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libboost-thread-dev, libboost-date-time-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig, ${misc:Depends}
+Description: The GNU Software Radio Core Library
  This package contains the core GNU Radio libraries.
  .
  This package contains header files needed by developers.
 
-Package: gnuradio-doc
-Section: doc
-Architecture: all
-Description: Software Defined Radio
- This package contains the documentation for the GNU Radio software
- defined radio system.
+Package: libgnuradio-audio-alsa0
+Section: libs
+Architecture: any
+Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+
+Package: libgnuradio-audio-alsa-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev, ${misc:Depends}
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-qtgui0
+Section: libs
+Architecture: any
+Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: GNU Radio C++ blocks for QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
+
+Package: libgnuradio-qtgui-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev, ${misc:Depends}
+Description: GNU Radio C++ blocks for QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-usrp0
+Section: libs
+Architecture: any
+Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+
+Package: libgnuradio-usrp-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version}), ${misc:Depends}
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-usrp2-0
+Section: libs
+Architecture: any
+Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: GNU Radio C++ blocks for USRP2 hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral 2.
+
+Package: libgnuradio-usrp2-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version}), ${misc:Depends}
+Description: GNU Radio C++ blocks for USRP2 hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral 2.
+ .
+ This package contains header files needed by developers.
+
+################################################################################
+# Python libraries for USRP                                                    #
+################################################################################
+
+Package: python-usrp
+Architecture: any
+Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for the USRP library
+ This package provides auxiliary routines in Python for manipulating the USRP
+ hardware.
+
+################################################################################
+# Python libraries for GNU Radio components                                    #
+################################################################################
 
 Package: python-gnuradio-core
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
+Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy, ${misc:Depends}
+Conflicts: python-gnuradio (<< 3.2)
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -100,7 +303,7 @@ Description: Python bindings for GNU Radio core library
 
 Package: python-gnuradio-wxgui
 Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core, python-wxgtk2.6
+Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl, python-numpy, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -108,39 +311,39 @@ Description: GNU Radio Graphical Interface Routines based on wxPython
  This package provides high level GUI construction classes based
  upon the wxPython bindings for wxWidgets.
 
-Package: python-gnuradio-audio-alsa
+Package: python-gnuradio-usrp
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp, ${misc:Depends}
+Provides: ${python:Provides}
 Section: python
-Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
-Description: Python bindings for GNU Radio ALSA audio driver
- This package provides the Python interface to the GNU Radio ALSA
- audio driver.
+Description: Python bindings for GNU Radio USRP driver
+ This package provides the Python interface to the GNU Radio USRP
+ driver and daughterboard drivers.
 
-Package: python-gnuradio-audio-jack
+Package: python-gnuradio-usrp2
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
+Provides: ${python:Provides}
 Section: python
-Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python JACK Audio Driver
- This package provides the Python interface to the GNU Radio driver
- for the JACK audio system.
+Description: Python bindings for GNU Radio USRP driver
+ This package provides the Python interface to the GNU Radio USRP
+ driver and daughterboard drivers.
 
-Package: python-gnuradio-audio-oss
+Package: python-gnuradio-audio-alsa
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core, ${misc:Depends}
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python OSS Audio Driver
- This package provides the Python interface to the GNU Radio driver
- for the OSS audio system.
+Description: Python bindings for GNU Radio ALSA audio driver
+ This package provides the Python wrappers around the GNU Radio ALSA
+ audio driver.
 
 Package: python-gnuradio-audio-portaudio
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}, python-gnuradio-audio
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -148,28 +351,29 @@ Description: GNU Radio Python PortAudio Driver
  This package provides the Python interface to the GNU Radio driver
  for the PortAudio audio system.
 
-Package: python-gnuradio-atsc
+Package: python-gnuradio-audio-jack
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Section: python
+Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio ATSC Receiver
- This package provides a decoder for ATSC waveforms using GNU Radio.
+Description: GNU Radio Python JACK Audio Driver
+ This package provides the Python interface to the GNU Radio driver
+ for the JACK audio system.
 
-Package: python-gnuradio-comedi
+Package: python-gnuradio-audio-oss
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Section: python
+Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python Comedilib Driver
+Description: GNU Radio Python OSS Audio Driver
  This package provides the Python interface to the GNU Radio driver
- for the comedilib data acquisition hardware library.
+ for the OSS audio system.
 
 Package: python-gnuradio-cvsd-vocoder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -179,7 +383,7 @@ Description: GNU Radio CVSD Vocoder
 
 Package: python-gnuradio-gsm-fr-vocoder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -187,9 +391,19 @@ Description: GNU Radio GSM Full-Rate Vocoder
  This package provides an implementation of a full-rate GSM vocoder 
  for GNU Radio.
 
+Package: python-gnuradio-qtgui
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core, ${misc:Depends}
+Section: python
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for GNU Radio ALSA audio driver
+ This package provides the Python wrappers around the GNU Radio QT
+ GUI C++ blocks.
+
 Package: python-gnuradio-trellis
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -199,7 +413,7 @@ Description: GNU Radio Trellis-Coded Modulation library
 
 Package: python-gnuradio-video-sdl
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, ${misc:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -207,199 +421,159 @@ Description: GNU Radio SDL Interface Library
  This package provides an interface to the SDL rendering library
  for GNU Radio.
 
-Package: python-gnuradio
-Section: python
-Architecture: all
-Depends: python-gnuradio-core, python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-atsc, python-gnuradio-comedi, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-trellis, python-gnuradio-video-sdl
+################################################################################
+# GNU Radio Utilities, Examples, and Applications                              #
+################################################################################
+
+Package: gnuradio-utils
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy, ${misc:Depends}
 Provides: ${python:Provides}
+Section: comm
 XB-Python-Version: ${python:Versions}
-Description: Python Libraries for GNU Radio Components
- This is a virtual package that depends upon all the Python components 
- for GNU Radio.
+Description: GNU Radio Utilities
+ This package provides commonly used utilities for GNU Radio
 
 Package: gnuradio-examples
 Architecture: any
-Suggests: usrp
-Depends: ${python:Depends}, python-gnuradio-core, python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio
+Depends: ${python:Depends}, python-gnuradio-core, ${misc:Depends}
+Provides: ${python:Provides}
+Recommends: python-gnuradio-wxgui, python-gnuradio
 Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Example Programs
- This package provides examples of GNU Radio usage using Python
-
-Package: gnuradio
-Section: comm
-Architecture: all
-Depends: gnuradio-doc, python-gnuradio, gnuradio-examples
-Suggests: usrp
-Descripton: GNU Software Defined Radio
- This is a virtual package that depends the entire GNU Radio collection of
- components.  If you are using a USRP, you should also install the usrp package.
-
-Package: gnuradio-dev
-Section: libdevel
-Architecture: all
-Depends: libgnuradio-core0-dev, libgnuradio-omnithread0-dev, libmblock0-dev, libpmt0-dev
-Description: Development headers for GNU Radio C++ development
- This is a virtual package that depends on all the development header packages
- for the various GNU Radio components.  It is only needed if you intend to develop
- custom GNU Radio signal processing blocks in C++.
-
-Package: usrp-firmware
-Section: contrib/comm
-Architecture: all
-Description: control applications and firmware for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- 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.
- .
- This package contains the basic FPGA bitstrings for normal USRP operation,
- which need non-free tools to build.
-
-Package: libusrp0c2a
-Section: contrib/libs
-Architecture: any
-Depends: ${shlibs:Depends}, usrp-firmware
-Conflicts: libusrp0
-Replaces: libusrp0
-Suggests: usrp-doc
-Description: Client side library for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- 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.
- .
- This package contains the client-side library, providing an easy interface
- for communicating with the USRP.
+ This package provides examples of GNU Radio usage using Python.
 
-Package: libusrp0-dev
-Section: contrib/libdevel
+Package: gnuradio-pager
 Architecture: any
-Depends: libusrp0c2a (= ${Source-Version}), libusb-dev
-Description: Client side library for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- 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.
- .
- This package contains the client-side library, providing an easy interface
- for communicating with the USRP.
- .
- This package contains header files needed by developers.
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio FLEX Pager Decoder
+ This package provides a decoder for the FLEX paging protocol for GNU Radio
 
-Package: libusrp-inband0c2a
-Section: contrib/libs
+Package: gnuradio-sounder
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: Client side library for the USRP with in-band signaling
- The package is an alternative C++ interface to the USRP that implements
- an experimental in-band signaling method across the USB.
+Replaces: gnuradio-sounder-firmware
+Conflicts: gnuradio-sounder-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Channel Sounder Application
+ This package provides an RF channel sounder application for GNU Radio
 
-Package: libusrp-inband0-dev
-Section: contrib/libdevel
+Package: gnuradio-gpio
 Architecture: any
-Depends: libusrp-inband0c2a (= ${Source-Version}), libusrp0-dev
-Description: Client side library for the USRP with in-band signaling
- The package is an alternative C++ interface to the USRP that implements
- an experimental in-band signaling method across the USB.
- .
- This package contains header files needed by developers.
-
-Package: usrp-doc
-Section: doc
-Architecture: all
-Description: Software Defined Radio
- This package contains the documentation for the Universal Software Radio
- Peripheral (USRP) hardware and interface library.
+Replaces: gnuradio-gpio-firmware
+Conflicts: gnuradio-gpio-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Streaming Digital Application
+ This package provides streaming digital GPIO capabilities for GNU Radio
 
-Package: python-usrp
+Package: gnuradio-radar-mono
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Replaces: gnuradio-radar-mono-firmware
+Conflicts: gnuradio-radar-mono-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, ${misc:Depends}
 Provides: ${python:Provides}
-Section: contrib/python
+Section: comm
 XB-Python-Version: ${python:Versions}
-Description: Python bindings for the USRP library
- This package provides the modules that enable one to use the USRP as a
- standalone device from Python, independent of GNU Radio proper.
+Description: GNU Radio Monostatic Radar Application
+ This package provides a monostatic radar application for GNU Radio
 
-Package: python-gnuradio-usrp
+Package: gnuradio-radio-astronomy
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui, ${misc:Depends}
 Provides: ${python:Provides}
-Section: contrib/python
+Section: comm
 XB-Python-Version: ${python:Versions}
-Description: Python bindings for GNU Radio USRP driver
- This package provides the Python interface to the GNU Radio USRP
- driver and daughterboard drivers.
+Description: GNU Radio Radio Astronomy Applications
+ This package provides radio astronomy applications for GNU Radio
 
-Package: gnuradio-utils
+Package: gnuradio-companion
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
+Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml, python-cheetah, python-gtk2, ${misc:Depends}
 Provides: ${python:Provides}
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio Utilities
- This package provides commonly used utilities for GNU Radio
+Description: The GNU Radio Companion
+ GRC is a graphical flowgraph editor for the GNU Software Radio
 
-Package: usrp
-Section: contrib/comm
-Architecture: all
-Depends: usrp-doc, usrp-firmware
-Description: The Universal Software Radio Peripheral
- This is a virtual package that depends on the entire USRP software collection.
+################################################################################
+# Documentation packages                                                       #
+################################################################################
 
-Package: gnuradio-pager
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
-Section: contrib/comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio FLEX Pager Decoder
- This package provides a decoder for the FLEX paging protocol for GNU Radio
+Package: gnuradio-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Software Defined Radio
+ This package contains the documentation for the GNU Radio software
+ defined radio system.
 
-Package: gnuradio-sounder-firmware
-Section: contrib/comm
+Package: usrp-doc
+Section: doc
 Architecture: all
-Description: GNU Radio Channel Sounder Application
- This package provides an RF channel sounder application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which 
- require non-free tools to build.
+Depends: ${misc:Depends}
+Description: Software Defined Radio
+ This package contains the documentation for the Universal Software Radio
+ Peripheral (USRP) hardware and interface library.
 
-Package: gnuradio-sounder
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-sounder-firmware
-Section: contrib/comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Channel Sounder Application
- This package provides an RF channel sounder application for GNU Radio
+################################################################################
+# Meta-packages                                                                #
+################################################################################
 
-Package: gnuradio-radar-mono-firmware
-Section: contrib/comm
+Package: libgnuradio
+Section: libs
 Architecture: all
-Description: GNU Radio Monostatic Radar Firmware
- This package provides a monostatic radar application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which
- require non-free tools to build.
+Depends: libgnuradio-core0, ${misc:Depends}
+Recommends: libgnuradio-audio-alsa0, libgnuradio-qtqui, libgnuradio-usrp0, libgnuradio-usrp2-0
+Description: GNU Radio C++ API libraries
+ This is a virtual package that depends, recommends, or suggests all of the
+ binary packages that make up the GNU Radio C++ API.  For development headers,
+ install libgnuradio-dev.
+
+Package: libgnuradio-dev
+Section: libdevel
+Architecture: all
+Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev, ${misc:Depends}
+Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev,
+Suggests: gnuradio-doc, usrp-doc
+Replaces: gnuradio-dev
+Description: Development headers for GNU Radio C++ development
+ This is a virtual package that depends or recommends the development header
+ packages for the GNU Radio C++ API.  It is only needed if you intend
+ to develop custom GNU Radio signal processing blocks in C++.
 
-Package: gnuradio-radar-mono
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-radar-mono-firmware
-Section: contrib/comm
+Package: python-gnuradio
+Section: python
+Architecture: all
+Depends: python-gnuradio-core, ${misc:Depends}
+Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-qtgui, python-gnuradio-trellis, python-gnuradio-video-sdl, python-gnuradio-usrp, python-gnuradio-usrp2
+Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Description: GNU Radio Monostatic Radar Application
- This package provides a monostatic radar application for GNU Radio
+Description: Python Libraries for GNU Radio Components
+ This is a virtual package that depends or recommends all of the packages that
+ make up the GNU Radio Python API.
 
-Package: gnuradio-radio-astronomy
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
-Section: contrib/comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Radio Astronomy Applications
- This package provides radio astronomy applications for GNU Radio
+Package: gnuradio-apps
+Section: comm
+Architecture: all
+Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder, gnuradio-radio-astronomy, gnuradio-radar-mono, ${misc:Depends}
+Description: The GNU Software Radio Toolkit - applications
+ This is a virtual package that depends on top-level GNU Radio application
+ packages.
+
+Package: gnuradio
+Section: comm
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples, gnuradio-apps
+Description: The GNU Software Radio Toolkit
+ This is a virtual package that installs the entire GNU Radio and USRP software
+ set.