Imported Debian patch 3.0.4-2

diff --git a/config.guess b/config.guess
index 0f0fe712ae6d6e0cfa6d50da3b1812ef530de814..278f9e9e07c1d1a3bda668e6529bcce3006cfbdf 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
     sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
        exit ;;
     *:Interix*:[3456]*)
        case ${UNAME_MACHINE} in
-           x86) 
+           x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
            EM64T | authenticamd)

diff --git a/config.sub b/config.sub
index 5defff65a6e4cd091921d9bcab0ab286092ec39e..1761d8bdf6307c02067b3581e183ba2fdef7e1fa 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16c)
-               basic_machine=cr16c-unknown
+       cr16)
+               basic_machine=cr16-unknown
                os=-elf
                ;;
        crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-mingw32
                ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;

diff --git a/debian/changelog b/debian/changelog
index 783d47109191626ab5fe7652e0aa2e01c125ef24..60df3c61881d0467ccf20a861331ddab4564742f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnuradio (3.0.4-2) unstable; urgency=high
+
+  * rebuild with new version number and upload to finally (?) recover from
+    over-zealous removal in response to bug 453154
+  * recommend udev instead of hotplug, closes: #448907
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 23 Dec 2007 12:11:49 -0700
+
 gnuradio (3.0.4-1) unstable; urgency=low
 
   * new upstream version

diff --git a/debian/control b/debian/control
index 187645ac252be426a79490c19ec2bd2cf702fa9b..91e7fd929c7c692c345fd40fffd887b7d457b231 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ 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-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}), python-wxgtk2.6, 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
 Replaces: gr-audio-alsa, gr-audio-oss, gr-audio-jack
@@ -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-doc, 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,
@@ -113,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
@@ -146,7 +147,7 @@ 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

diff --git a/debian/rules b/debian/rules
index 2e358f01e0c5309a082fa1804b0f7d38e2d657a6..36b35c94f92e2c8fcfc363c4adec139dd4ffd35e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
 
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 
        -test -r /usr/share/misc/config.sub && \
                cp -f /usr/share/misc/config.sub config.sub

diff --git a/debian/usrp.dirs b/debian/usrp.dirs
index 253c03330a85fe7eb2276ef0dbb00a9726a1409e..a26ca6290b15c26f2c60c95d7c1c65bb6d15f91c 100644 (file)
--- a/debian/usrp.dirs
+++ b/debian/usrp.dirs
@@ -1,2 +1 @@
 etc/hotplug.d/usb
-usr/sbin