Imported Debian patch 3.0.4-2

[debian/gnuradio] / debian / control

diff --git a/debian/control b/debian/control
index 09fc46e7666d01a36d7b2288457c1e2e087607e7..91e7fd929c7c692c345fd40fffd887b7d457b231 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,18 @@ 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-central (>= 0.5), python-numeric, python-wxgtk2.6, sdcc, swig
+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-numeric, python-wxgtk2.6, sdcc, swig, xmlto
 Build-Depends-Indep: python-all-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 XS-Python-Version: >= 2.3
 
 Package: gnuradio
 Architecture: any
 Section: comm
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, gnuradio-doc, libgnuradio-core0-dev, libgnuradio-core0c2a, libgnuradio-core0c2a-dbg, python-gnuradio (= ${Source-Version}), gnuradio-examples
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, gnuradio-doc, libgnuradio-core0-dev, libgnuradio-core0c2a, libgnuradio-core0c2a-dbg, python-gnuradio (= ${binary:Version}), python-wxgtk2.6, gnuradio-examples
 Suggests: usrp
-Conflicts: gr-audio-alsa, gr-audio-oss, gr-audio-jack, gr-wxgui
-Replaces: gr-audio-alsa, gr-audio-oss, gr-audio-jack, gr-wxgui
+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
@@ -35,7 +35,7 @@ Description: Software Defined Radio
 Package: libgnuradio-core0-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-core0c2a (= ${Source-Version})
+Depends: libgnuradio-core0c2a (= ${binary:Version})
 Description: Software Defined Radio
  This library contains Signal Processing routines that implement
  the functionality of traditional radio receivers and transmitters.
@@ -56,9 +56,10 @@ Description: Software Defined Radio
  This package contains the core GNU Radio libraries.
 
 Package: libgnuradio-core0c2a-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-core0c2a (= ${Source-Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0c2a (= ${binary:Version}), ${shlibs:Depends}
 Description: Software Defined Radio
  This package contains the debug symbols needed to debug programs that
  use the GNU Radio core libraries.
@@ -66,8 +67,8 @@ Description: Software Defined Radio
 Package: usrp
 Section: contrib/comm
 Architecture: any
-Depends: ${shlibs:Depends}, python, libusrp0-dev, libusrp0c2a-dbg, python-usrp (= ${Source-Version})
-Recommends: gnuradio, hotplug, usrp-firmware
+Depends: ${shlibs:Depends}, python, libusrp0-dev, libusrp0c2a-dbg, python-usrp (= ${binary:Version})
+Recommends: gnuradio, udev, usrp-doc, 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,
@@ -85,6 +86,14 @@ Description: control applications and firmware for the USRP
  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-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}
+Description: Software Defined Radio with USRP
+ This package contains the documentation for the USRP support that is
+ part of the GNU Radio software defined radio system.
+
 Package: usrp-firmware
 Section: contrib/comm
 Architecture: all
@@ -105,7 +114,7 @@ Provides: libusrp-dev
 Conflicts: libusrp-dev
 Section: contrib/libdevel
 Architecture: any
-Depends: libusrp0c2a (= ${Source-Version}), ${shlibs:Depends}
+Depends: libusrp0c2a (= ${binary:Version}), ${shlibs:Depends}
 Description: development library files 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
@@ -135,9 +144,10 @@ 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}
+Depends: libusrp0c2a (= ${binary:Version}), ${shlibs:Depends}
 Description: client side library debugging symbols 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
@@ -152,6 +162,8 @@ 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}
@@ -160,7 +172,7 @@ Description: Python bindings for GNU Radio
  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