capture work from old source tree towards 3.0.4-3, including an updated

build dependency and rules file change to fix a rebuilding problem

diff --git a/debian/changelog b/debian/changelog
index 60df3c61881d0467ccf20a861331ddab4564742f..e87585195356888ec2fdd2a123d873d17f2b8dfd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnuradio (3.0.4-3) UNRELEASED; urgency=low
+
+  * change build-dep from fftw3-dev to libfftw3-dev, closes: #458231
+  * fix problem with rebuilding, closes: #441739
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 31 Jan 2008 11:16:46 +1100
+
 gnuradio (3.0.4-2) unstable; urgency=high
 
   * rebuild with new version number and upload to finally (?) recover from

diff --git a/debian/control b/debian/control
index 91e7fd929c7c692c345fd40fffd887b7d457b231..ad05a49ae9de7a94bb03de9a19a7524ad6bd2383 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-all-dev, python-central (>= 0.5), python-numeric, python-wxgtk2.6, sdcc, swig, xmlto
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, libfftw3-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.3
 XS-Python-Version: >= 2.3

diff --git a/debian/rules b/debian/rules
index 36b35c94f92e2c8fcfc363c4adec139dd4ffd35e..8896c3b6d76cc5da920fc6fece92ce02f0828d64 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,8 @@ clean:
        -test -r /usr/share/misc/config.guess && \
                cp -f /usr/share/misc/config.guess config.guess
 
-       dh_clean  --exclude ./gr-gsm-fr-vocoder/src/lib/gsm/README.orig
+       #dh_clean  --exclude ./gr-gsm-fr-vocoder/src/lib/gsm/README.orig
+       dh_clean
 
 install:
        dh_testdir