Imported Debian patch 3.0-3

diff --git a/debian/changelog b/debian/changelog
index b69baf353c4a12f49c5fc92227b68ea8345ef197..afd234e7be595f794614fe669cc56979ec0f10a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnuradio (3.0-3) unstable; urgency=high
+
+  * put python-all-dev back in the build-depends list, closes: #398246
+  * move gr-wxgui conflicts/depends to python-gnuradio, closes: #396302
+  * fix up sections in control to match overrides
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 12 Nov 2006 10:59:58 -0800
+
 gnuradio (3.0-2) unstable; urgency=high
 
   * reworked package dependencies so that the 'gnuradio' binary package no

diff --git a/debian/control b/debian/control
index 09fc46e7666d01a36d7b2288457c1e2e087607e7..95eea7c77638dbd6e0d2a84013d84c376879e9b3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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
 Build-Depends-Indep: python-all-dev
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
@@ -13,8 +13,8 @@ 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
 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
@@ -135,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}
@@ -152,6 +153,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 +163,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