diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | debian/.gitignore | 121 | ||||
| -rwxr-xr-x | debian/bin/gen-install-files.sh | 48 | ||||
| -rw-r--r-- | debian/changelog (renamed from debian/changelog.in) | 69 | ||||
| -rw-r--r-- | debian/control | 134 | ||||
| -rw-r--r-- | debian/copyright | 157 | ||||
| -rw-r--r-- | debian/custom/libusrp0.udev (renamed from debian/custom/libusrp.udev) | 0 | ||||
| -rw-r--r-- | debian/custom/libusrp2-0.limits (renamed from debian/custom/libusrp2.limits) | 0 | ||||
| -rw-r--r-- | debian/custom/usrp.hotplug | 47 | ||||
| -rw-r--r-- | debian/libgnuradio-core0.dirs (renamed from debian/libgnuradio-core.dirs) | 0 | ||||
| -rw-r--r-- | debian/libgnuradio-core0.install (renamed from debian/libgnuradio-core.install) | 0 | ||||
| -rw-r--r-- | debian/libgromnithread-dev.dirs (renamed from debian/libgnuradio-omnithread-dev.dirs) | 0 | ||||
| -rw-r--r-- | debian/libgromnithread-dev.install (renamed from debian/libgnuradio-omnithread-dev.install) | 0 | ||||
| -rw-r--r-- | debian/libgromnithread0.install (renamed from debian/libgnuradio-omnithread.install) | 0 | ||||
| -rw-r--r-- | debian/libgruel0.install (renamed from debian/libgruel.install) | 0 | ||||
| -rw-r--r-- | debian/libmblock0.install (renamed from debian/libmblock.install) | 0 | ||||
| -rw-r--r-- | debian/libusrp-inband.install | 2 | ||||
| -rw-r--r-- | debian/libusrp.postrm | 10 | ||||
| -rw-r--r-- | debian/libusrp0.dirs (renamed from debian/libusrp.dirs) | 0 | ||||
| -rw-r--r-- | debian/libusrp0.install (renamed from debian/libusrp.install) | 0 | ||||
| -rw-r--r-- | debian/libusrp0.postinst (renamed from debian/libusrp.postinst) | 3 | ||||
| -rw-r--r-- | debian/libusrp2-0.dirs (renamed from debian/libusrp2.dirs) | 0 | ||||
| -rw-r--r-- | debian/libusrp2-0.install (renamed from debian/libusrp2.install) | 2 | ||||
| -rw-r--r-- | debian/libusrp2-0.postinst (renamed from debian/libusrp2.postinst) | 6 | ||||
| -rw-r--r-- | debian/libusrp2.postrm | 10 | ||||
| -rwxr-xr-x | debian/rules | 14 |
26 files changed, 400 insertions, 224 deletions
diff --git a/configure.ac b/configure.ac index b6b596bef..f51f2103f 100644 --- a/configure.ac +++ b/configure.ac @@ -392,7 +392,6 @@ AC_CONFIG_FILES([\ Makefile \ run_tests.sh \ config/Makefile \ - debian/changelog \ ]) dnl run_tests.sh is created from run_tests.sh.in . Make it executable. diff --git a/debian/.gitignore b/debian/.gitignore index ca163135c..fbcff46ca 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,2 +1,119 @@ -/changelog -/*.log +*.log +*.debhelper +*.substvars +files +tmp +gnuradio-companion.install +gnuradio-examples.install +gnuradio-gpio.install +gnuradio-pager.install +gnuradio-radar-mono.install +gnuradio-radio-astronomy.install +gnuradio-sounder.install +gnuradio-utils.install +libgnuradio-audio-alsa-dev.install +libgnuradio-audio-alsa0.install +libgnuradio-audio-jack-dev.install +libgnuradio-audio-jack0.install +libgnuradio-audio-oss-dev.install +libgnuradio-audio-oss0.install +libgnuradio-audio-portaudio-dev.install +libgnuradio-audio-portaudio0.install +libgnuradio-core-dev.install +libgnuradio-cvsd-vocoder-dev.install +libgnuradio-cvsd-vocoder0.install +libgnuradio-gsm-fr-vocoder-dev.install +libgnuradio-gsm-fr-vocoder0.install +libgnuradio-pager-dev.install +libgnuradio-pager0.install +libgnuradio-qtgui-dev.install +libgnuradio-qtgui0.install +libgnuradio-trellis-dev.install +libgnuradio-trellis0.install +libgnuradio-usrp-dev.install +libgnuradio-usrp0.install +libgnuradio-usrp2-0.install +libgnuradio-usrp2-dev.install +libgnuradio-video-sdl-dev.install +libgnuradio-video-sdl0.install +libusrp-dev.install +libusrp2-dev.install +python-gnuradio-audio-alsa.install +python-gnuradio-audio-jack.install +python-gnuradio-audio-oss.install +python-gnuradio-audio-portaudio.install +python-gnuradio-core.install +python-gnuradio-cvsd-vocoder.install +python-gnuradio-gsm-fr-vocoder.install +python-gnuradio-qtgui.install +python-gnuradio-trellis.install +python-gnuradio-usrp.install +python-gnuradio-usrp2.install +python-gnuradio-video-sdl.install +python-gnuradio-wxgui.install +python-usrp.install +/gnuradio/ +/gnuradio-apps/ +/gnuradio-companion/ +/gnuradio-doc/ +/gnuradio-examples/ +/gnuradio-gpio/ +/gnuradio-pager/ +/gnuradio-radar-mono/ +/gnuradio-radio-astronomy/ +/gnuradio-sounder/ +/gnuradio-utils/ +/libgnuradio/ +/libgnuradio-dev/ +/libgnuradio-audio-alsa-dev/ +/libgnuradio-audio-alsa0/ +/libgnuradio-audio-jack-dev/ +/libgnuradio-audio-jack0/ +/libgnuradio-audio-oss-dev/ +/libgnuradio-audio-oss0/ +/libgnuradio-audio-portaudio0/ +/libgnuradio-audio-portaudio-dev/ +/libgnuradio-core-dev/ +/libgnuradio-core0/ +/libgnuradio-cvsd-vocoder-dev/ +/libgnuradio-cvsd-vocoder0/ +/libgnuradio-gsm-fr-vocoder-dev/ +/libgnuradio-gsm-fr-vocoder0/ +/libgnuradio-pager-dev/ +/libgnuradio-pager0/ +/libgnuradio-qtgui-dev/ +/libgnuradio-qtgui0/ +/libgnuradio-trellis-dev/ +/libgnuradio-trellis0/ +/libgnuradio-usrp-dev/ +/libgnuradio-usrp0/ +/libgnuradio-usrp2-0/ +/libgnuradio-usrp2-dev/ +/libgnuradio-video-sdl-dev/ +/libgnuradio-video-sdl0/ +/libgromnithread-dev/ +/libgromnithread0 +/libgruel-dev/ +/libgruel0/ +/libmblock-dev/ +/libmblock0/ +/libusrp-dev/ +/libusrp0/ +/libusrp2-0/ +/libusrp2-dev/ +/python-gnuradio/ +/python-gnuradio-audio-alsa/ +/python-gnuradio-audio-jack/ +/python-gnuradio-audio-oss/ +/python-gnuradio-audio-portaudio/ +/python-gnuradio-core/ +/python-gnuradio-cvsd-vocoder/ +/python-gnuradio-gsm-fr-vocoder/ +/python-gnuradio-qtgui/ +/python-gnuradio-trellis/ +/python-gnuradio-usrp/ +/python-gnuradio-usrp2/ +/python-gnuradio-video-sdl/ +/python-gnuradio-wxgui/ +/python-usrp/ +/usrp-doc/ diff --git a/debian/bin/gen-install-files.sh b/debian/bin/gen-install-files.sh index ab04787c9..53460f29e 100755 --- a/debian/bin/gen-install-files.sh +++ b/debian/bin/gen-install-files.sh @@ -42,8 +42,8 @@ $EXTRACT gnuradio-core/src/lib/swig/Makefile swiginclude_HEADERS >>$NAME echo usr/lib/libgnuradio-core.so >>$NAME echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME -# libgnuradio-audio-alsa -NAME=debian/libgnuradio-audio-alsa.install +# libgnuradio-audio-alsa0 +NAME=debian/libgnuradio-audio-alsa0.install rm -f $NAME touch $NAME $EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME @@ -59,8 +59,8 @@ $EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-audio-alsa/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-audio-alsa.so >>$NAME -# libgnuradio-audio-jack -NAME=debian/libgnuradio-audio-jack.install +# libgnuradio-audio-jack0 +NAME=debian/libgnuradio-audio-jack0.install rm -f $NAME touch $NAME $EXTRACT gr-audio-jack/src/Makefile lib_LTLIBRARIES >>$NAME @@ -76,8 +76,8 @@ $EXTRACT gr-audio-jack/src/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-audio-jack/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-audio-jack.so >>$NAME -# libgnuradio-audio-oss -NAME=debian/libgnuradio-audio-oss.install +# libgnuradio-audio-oss0 +NAME=debian/libgnuradio-audio-oss0.install rm -f $NAME touch $NAME $EXTRACT gr-audio-oss/src/Makefile lib_LTLIBRARIES >>$NAME @@ -93,8 +93,8 @@ $EXTRACT gr-audio-oss/src/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-audio-oss/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-audio-oss.so >>$NAME -# libgnuradio-audio-portaudio -NAME=debian/libgnuradio-audio-portaudio.install +# libgnuradio-audio-portaudio0 +NAME=debian/libgnuradio-audio-portaudio0.install rm -f $NAME touch $NAME $EXTRACT gr-audio-portaudio/src/Makefile lib_LTLIBRARIES >>$NAME @@ -110,8 +110,8 @@ $EXTRACT gr-audio-portaudio/src/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-audio-portaudio/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-audio-portaudio.so >>$NAME -# libgnuradio-cvsd-vocoder -NAME=debian/libgnuradio-cvsd-vocoder.install +# libgnuradio-cvsd-vocoder0 +NAME=debian/libgnuradio-cvsd-vocoder0.install rm -f $NAME touch $NAME $EXTRACT gr-cvsd-vocoder/src/lib/Makefile lib_LTLIBRARIES >>$NAME @@ -126,8 +126,8 @@ $EXTRACT gr-cvsd-vocoder/src/lib/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-cvsd-vocoder/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-cvsd-vocoder.so >>$NAME -# libgnuradio-gsm-fr-vocoder -NAME=debian/libgnuradio-gsm-fr-vocoder.install +# libgnuradio-gsm-fr-vocoder0 +NAME=debian/libgnuradio-gsm-fr-vocoder0.install rm -f $NAME touch $NAME $EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile lib_LTLIBRARIES >>$NAME @@ -142,8 +142,8 @@ $EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-gsm-fr-vocoder/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-gsm-fr-vocoder.so >>$NAME -# libgnuradio-pager -NAME=debian/libgnuradio-pager.install +# libgnuradio-pager0 +NAME=debian/libgnuradio-pager0.install rm -f $NAME touch $NAME $EXTRACT gr-pager/src/Makefile lib_LTLIBRARIES >>$NAME @@ -158,8 +158,8 @@ $EXTRACT gr-pager/src/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-pager/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-pager.so >>$NAME -# libgnuradio-qtgui -NAME=debian/libgnuradio-qtgui.install +# libgnuradio-qtgui0 +NAME=debian/libgnuradio-qtgui0.install rm -f $NAME touch $NAME $EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES >>$NAME @@ -173,8 +173,8 @@ touch $NAME $EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME echo usr/lib/libgnuradio-qtgui.so >>$NAME -# libgnuradio-trellis -NAME=debian/libgnuradio-trellis.install +# libgnuradio-trellis0 +NAME=debian/libgnuradio-trellis0.install rm -f $NAME touch $NAME $EXTRACT gr-trellis/src/lib/Makefile lib_LTLIBRARIES >>$NAME @@ -189,8 +189,8 @@ $EXTRACT gr-trellis/src/lib/Makefile grinclude_HEADERS >>$NAME $EXTRACT gr-trellis/Makefile dist_pkgconfig_DATA >>$NAME echo usr/lib/libgnuradio-trellis.so >>$NAME -# libgnuradio-usrp -NAME=debian/libgnuradio-usrp.install +# libgnuradio-usrp0 +NAME=debian/libgnuradio-usrp0.install rm -f $NAME touch $NAME $EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME @@ -205,8 +205,8 @@ touch $NAME $EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME echo usr/lib/libgnuradio-usrp.so >>$NAME -# libgnuradio-usrp2 -NAME=debian/libgnuradio-usrp2.install +# libgnuradio-usrp2-0 +NAME=debian/libgnuradio-usrp2-0.install rm -f $NAME touch $NAME $EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME @@ -221,8 +221,8 @@ touch $NAME $EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME echo usr/lib/libgnuradio-usrp2.so >>$NAME -# libgnuradio-video-sdl -NAME=debian/libgnuradio-video-sdl.install +# libgnuradio-video-sdl0 +NAME=debian/libgnuradio-video-sdl0.install rm -f $NAME touch $NAME $EXTRACT gr-video-sdl/src/Makefile lib_LTLIBRARIES >>$NAME diff --git a/debian/changelog.in b/debian/changelog index 192158a7c..e7b8998be 100644 --- a/debian/changelog.in +++ b/debian/changelog @@ -1,59 +1,36 @@ -gnuradio (3.3svn-@SVNVERSION@) unstable; urgency=low +gnuradio (3.3git-1) unstable; urgency=low - * Development trunk updates as of revision @SVNVERSION@ - * See http://gnuradio.org/trac + * upstream unstable version from git repository - -- Johnathan Corgan <jcorgan@corganenterprises.com> @BUILD_DATE@ + -- Johnathan Corgan <jcorgan@corganenterprises.com> Thu, 24 Sep 2009 23:00:00 -0600 + +gnuradio (3.2.2-1) unstable; urgency=low -gnuradio (3.2) unstable; urgency=low + * new upstream version, includes gcc4.3 support, closes: #474801, #524387 + * merge debian/ content restructuring from upstream svn + * change build-dep from fftw3-dev to libfftw3-dev, closes: #458231 + * fix problem with rebuilding, closes: #441739 + * no longer need to move to contrib now that sdcc is fully back in main, + we just need to build depend on sdcc 2.9.0 or later, closes: #457402 + * rebuild reflects python-central file location change, closes: #490513 + * change Jack build depend to libjack-dev, closes: #527413 - * New upstream release 3.2 - * See http://gnuradio.org/trac + -- Bdale Garbee <bdale@gag.com> Tue, 15 Sep 2009 23:37:57 -0600 - -- Johnathan Corgan <jcorgan@corganenterprises.com> Sat, 23 May 2009 18:00:00 -0800 +gnuradio (3.0.4-2) unstable; urgency=high -gnuradio (3.1.3) stable; urgency=low + * 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 - * "Upstream" release, see http://gnuradio.org/trac/wiki/Release3.1Branch + -- Bdale Garbee <bdale@gag.com> Sun, 23 Dec 2007 12:11:49 -0700 - -- Johnathan Corgan <jcorgan@corganenterprises.com> Sat, 23 Aug 2008 19:00:00 -0800 +gnuradio (3.0.4-1) unstable; urgency=low -gnuradio (3.1.2) stable; urgency=low - - * "Upstream" release, see http://gnuradio.org/trac/wiki/Release3.1Branch - - -- Johnathan Corgan <jcorgan@corganenterprises.com> Wed, 24 Mar 2008 09:00:00 -0800 - -gnuradio (3.1.1) stable; urgency=high - - * Fixed regressions in digital packet radio (t196,t198) - * Fixed RX phase offset causing sidebands (t195) - * Fixed TX I/Q swapping bug (t179) - * Fixed loopback bug in gr-sounder - * Added complex and dual-channel options to oscope for - BasicRX and LFRX - - -- Johnathan Corgan <jcorgan@corganenterprises.com> Sun, 4 Nov 2007 21:15:00 -0800 - -gnuradio (3.1.0) stable; urgency=low - - * Release 3.1 stable branch - * add/split packages to cover entire GNU Radio distribution - - -- Johnathan Corgan <jcorgan@corganenterprises.com> Mon, 22 Oct 2007 10:37:00 -0800 - -gnuradio (3.0.svn) unstable; urgency=low - - * add/split packages to cover entire GNU Radio distribution + * new upstream version * fix build failure with gcc-4.3 by adding a #include, closes: #420896 - * update copyright assertion on the debian/ contents, since I have - assigned my copyright to the FSF and now have upstream commit rights - * merge debian/ into upstream SVN repository - * add --disable-gr-qtgui (at least until we figure out qwt build deps!) - * add build dep on python-numpy - * conditionalize configure and clean targets to handle build from SVN - - -- Bdale Garbee <bdale@gag.com> Thu, 26 Jul 2007 18:07:52 -0600 + + -- Bdale Garbee <bdale@gag.com> Tue, 14 Aug 2007 22:38:32 -0600 gnuradio (3.0.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4c11a9654..a7b33f0be 100644 --- a/debian/control +++ b/debian/control @@ -5,22 +5,22 @@ Source: gnuradio Section: comm Priority: optional -Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com> +Maintainer: Bdale Garbee <bdale@gag.com> Build-Conflicts: automake1.8, automake1.9 -Build-Depends: debhelper (>= 5.0.38), build-essential, python-central (>=0.5.6), automake, libtool, pkg-config, python-dev (>=2.6), python-dev (<2.7), swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, libblas-dev, texlive-latex-base -Standards-Version: 3.7.2 -XS-Python-Version: =2.6 +Build-Depends: automake, debhelper (>= 5), doxygen, ghostscript, guile-1.8, libasound2-dev, libaudio-dev, libblas-dev, libboost-date-time1.37-dev | libboost-date-time-dev, libboost-program-options-dev | libboost-program-options1.37-dev, libboost-thread-dev | libboost-thread1.37-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-central, python-cheetah, python-dev, python-gtk2, python-lxml, python-numpy, python-qt4, python-qt4-dev, python-wxgtk2.8, sdcc, swig, texlive-latex-base, xdg-utils, xmlto +Standards-Version: 3.8.3 +XS-Python-Version: >=2.5 ################################################################################ # C++ auxiliary libraries # ################################################################################ -Package: libgruel +Package: libgruel0 Section: libs Architecture: any Depends: ${shlibs:Depends} -Replaces: libpmt -Conflicts: libpmt +Replaces: libpmt0 +Conflicts: libpmt0 Description: GNU Radio Utility Etcetera Library This package implements a variety of low-level utility routines for GNU Radio. @@ -28,7 +28,7 @@ Description: GNU Radio Utility Etcetera Library Package: libgruel-dev Section: libdevel Architecture: any -Depends: libgruel (= ${binary:Version}), libboost1.37-dev, guile-1.8 +Depends: libgruel0 (= ${binary:Version}), libboost-date-time1.37-dev | libboost-date-time-dev Replaces: libpmt-dev Conflicts: libpmt-dev Description: GNU Radio Utility Etcetera Library @@ -37,7 +37,7 @@ Description: GNU Radio Utility Etcetera Library . This package contains header files needed by developers. -Package: libgnuradio-omnithread +Package: libgromnithread0 Section: libs Architecture: any Replaces: libgnuradio-omnithread0c2a @@ -47,12 +47,12 @@ 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-omnithread-dev +Package: libgromnithread-dev Section: libdevel Architecture: any Replaces: libgnuradio-omnithread0-dev Conflicts: libgnuradio-omnithread0-dev -Depends: libgnuradio-omnithread (= ${binary:Version}) +Depends: libgromnithread0 (= ${binary:Version}) Description: GNU Radio Omnithreads Abstraction Library This package is a fork of the omniORB-4.0.1 threading library for use with GNU Radio. @@ -63,12 +63,12 @@ Description: GNU Radio Omnithreads Abstraction Library # C++ M-Block library packages # ################################################################################ -Package: libmblock +Package: libmblock0 Section: libs Architecture: any Replaces: libmblock0c2a Conflicts: libmblock0c2a -Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), libgruel (= ${binary:Version}), ${shlibs:Depends} +Depends: libpmt0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio Message Block Library This package provides the GNU Radio message block library. @@ -77,7 +77,7 @@ Section: libdevel Architecture: any Replaces: libmblock0-dev Conflicts: libmblock0-dev -Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) +Depends: libmblock0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) Description: GNU Radio Message Block Library This package provides the GNU Radio message block library. . @@ -87,11 +87,11 @@ Description: GNU Radio Message Block Library # C++ USRP/USRP2 library packages # ################################################################################ -Package: libusrp +Package: libusrp0 Section: comm Architecture: any Depends: ${shlibs:Depends} -Replaces: libusrp0, libusrp0c2a, usrp-firmware +Replaces: libusrp0c2a, usrp-firmware Conflicts: usrp-firmware Suggests: usrp-doc Description: Client side library for the USRP(1) hardware @@ -109,7 +109,7 @@ Package: libusrp-dev Section: libdevel Architecture: any Replaces: libusrp0-dev -Depends: libusrp (= ${binary:Version}), libusb-dev, libboost-thread1.37-dev +Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread1.37-dev | libboost-thread-dev 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 @@ -123,10 +123,10 @@ Description: Client side library for the USRP(1) hardware . This package contains header files needed by developers. -Package: libusrp2 +Package: libusrp2-0 Section: comm Architecture: any -Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends} +Depends: libgruel0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs: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 @@ -141,7 +141,7 @@ Description: Client side library for the USRP2 hardware Package: libusrp2-dev Section: libdevel Architecture: any -Depends: libusrp2 (= ${binary:Version}), libboost-thread1.37-dev, libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) +Depends: libusrp2-0 (= ${binary:Version}), libboost-thread1.37-dev | libboost-thread-dev, libgromnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) 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 @@ -159,12 +159,12 @@ Description: Client side library for the USRP2 hardware # C++ GNU Radio block library packages # ################################################################################ -Package: libgnuradio-core +Package: libgnuradio-core0 Section: libs Architecture: any -Depends: libgruel (= ${binary:Version}), ${shlibs:Depends} -Conflicts: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a -Replaces: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a +Depends: libgruel0 (= ${binary:Version}), ${shlibs:Depends} +Conflicts: libgnuradio-core0c2, libgnuradio-core0c2a +Replaces: libgnuradio-core0c2, libgnuradio-core0c2a Suggests: gnuradio-doc Description: The GNU Sofware Radio Core Library This package contains the core GNU Radio libraries. @@ -174,80 +174,80 @@ Section: libdevel Architecture: any Replaces: libgnuradio-core0-dev Conflicts: libgnuradio-core0-dev -Depends: libgnuradio-core (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libboost-thread1.37-dev, libboost-date-time1.37-dev, libcppunit-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig +Depends: libgnuradio-core0 (= ${binary:Version}), libgruel-dev (= ${binary:Version}), libboost-thread1.37-dev | libboost-thread-dev, libboost-date-time1.37-dev | libboost-date-time-dev, libboost-program-options1.37-dev | libboost-program-options-dev, libgsl0-dev, libatlas-base-dev, libfftw3-dev, swig Description: The GNU Software Radio Core Library This package contains the core GNU Radio libraries. . This package contains header files needed by developers. -Package: libgnuradio-audio-alsa +Package: libgnuradio-audio-alsa0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs: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-alsa (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev +Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev 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-audio-jack +Package: libgnuradio-audio-jack0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block for JACK sound system This package contains the JACK sound system driver for GNU Radio. Package: libgnuradio-audio-jack-dev Section: libdevel Architecture: any -Depends: libgnuradio-audio-jack (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libjack-dev +Depends: libgnuradio-audio-jack0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libjack-dev Description: GNU Radio C++ block for JACK sound system This package contains the JACK sound system driver for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-audio-oss +Package: libgnuradio-audio-oss0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block for OSS sound system This package contains the OSS sound system driver for GNU Radio. Package: libgnuradio-audio-oss-dev Section: libdevel Architecture: any -Depends: libgnuradio-audio-oss (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-audio-oss0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block for OSS sound system This package contains the OSS sound system driver for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-audio-portaudio +Package: libgnuradio-audio-portaudio0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block for PORTAUDIO sound system This package contains the PORTAUDIO sound system driver for GNU Radio. Package: libgnuradio-audio-portaudio-dev Section: libdevel Architecture: any -Depends: libgnuradio-audio-portaudio (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), portaudio19-dev +Depends: libgnuradio-audio-portaudio0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), portaudio19-dev Description: GNU Radio C++ block for PORTAUDIO sound system This package contains the PORTAUDIO sound system driver for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-cvsd-vocoder +Package: libgnuradio-cvsd-vocoder0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block implementing the CVSD vocoder This package provides an implementation of a CVSD vocoder for GNU Radio. @@ -255,17 +255,17 @@ Description: GNU Radio C++ block implementing the CVSD vocoder Package: libgnuradio-cvsd-vocoder-dev Section: libdevel Architecture: any -Depends: libgnuradio-cvsd-vocoder (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-cvsd-vocoder0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block implement the CVSD vocoder This package provides an implementation of a CVSD vocoder for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-gsm-fr-vocoder +Package: libgnuradio-gsm-fr-vocoder0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block implementing the GSM full rate vocoder This package provides an implementation of a GSM-FR vocoder for GNU Radio. @@ -273,17 +273,17 @@ Description: GNU Radio C++ block implementing the GSM full rate vocoder Package: libgnuradio-gsm-fr-vocoder-dev Section: libdevel Architecture: any -Depends: libgnuradio-gsm-fr-vocoder (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-gsm-fr-vocoder0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block implementing the GSM full rate vocoder This package provides an implementation of a GSM-FR vocoder for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-pager +Package: libgnuradio-pager0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block implementing the FLEX one-way pager protocol This package provides an implementation of the FLEX one-way pager protocol for GNU Radio. @@ -291,17 +291,17 @@ Description: GNU Radio C++ block implementing the FLEX one-way pager protocol Package: libgnuradio-pager-dev Section: libdevel Architecture: any -Depends: libgnuradio-pager (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-pager0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block implementing the FLEX one-way pager protocol This package provides an implementation of the FLEX one-way pager protocol for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-qtgui +Package: libgnuradio-qtgui0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ blocks fro QT-based GUI applications This package contains the C++ library for using GNU Radio inside QT-based GUI applications. @@ -309,17 +309,17 @@ Description: GNU Radio C++ blocks fro QT-based GUI applications Package: libgnuradio-qtgui-dev Section: libdevel Architecture: any -Depends: libgnuradio-qtgui (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev +Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev Description: GNU Radio C++ blocks fro 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-trellis +Package: libgnuradio-trellis0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block implementing trellis-coded modulation This package provides an implementation of tellis-coded modulation for GNU Radio. @@ -327,17 +327,17 @@ Description: GNU Radio C++ block implementing trellis-coded modulation Package: libgnuradio-trellis-dev Section: libdevel Architecture: any -Depends: libgnuradio-trellis (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-trellis0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block implementing trellis-coded modulation This package provides an implementation of trellis-coded modulation for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-video-sdl +Package: libgnuradio-video-sdl0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ block implementing video-sdl-coded modulation This package provides an interface to the SDL rendering library for GNU Radio. @@ -345,17 +345,17 @@ Description: GNU Radio C++ block implementing video-sdl-coded modulation Package: libgnuradio-video-sdl-dev Section: libdevel Architecture: any -Depends: libgnuradio-video-sdl (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) +Depends: libgnuradio-video-sdl0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}) Description: GNU Radio C++ block implementing video-sdl-coded modulation This package provides an interface to the SDL rendering library for GNU Radio. . This package contains header files needed by developers. -Package: libgnuradio-usrp +Package: libgnuradio-usrp0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), libusrp (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ blocks for USRP(1) hardware This package contains the C++ API blocks for the Universal Software Radio Peripheral. @@ -363,17 +363,17 @@ Description: GNU Radio C++ blocks for USRP(1) hardware Package: libgnuradio-usrp-dev Section: libdevel Architecture: any -Depends: libgnuradio-usrp (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version}) +Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version}) 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 +Package: libgnuradio-usrp2-0 Section: libs Architecture: any -Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= ${binary:Version}), ${shlibs:Depends} +Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends} Description: GNU Radio C++ blocks for USRP2 hardware This package contains the C++ API blocks for the Universal Software Radio Peripheral 2. @@ -381,7 +381,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware Package: libgnuradio-usrp2-dev Section: libdevel Architecture: any -Depends: libgnuradio-usrp2 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version}) +Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version}) Description: GNU Radio C++ blocks for USRP2 hardware This package contains the C++ API blocks for the Universal Software Radio Peripheral 2. @@ -394,7 +394,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware Package: python-usrp Architecture: any -Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends} +Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends} Provides: ${python:Provides} Section: python XB-Python-Version: ${python:Versions} @@ -450,7 +450,7 @@ Description: Python bindings for GNU Radio USRP driver Package: python-gnuradio-audio-alsa Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= ${binary:Version}), python-gnuradio-core +Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core Section: python Provides: ${python:Provides}, python-gnuradio-audio XB-Python-Version: ${python:Versions} @@ -510,7 +510,7 @@ Description: GNU Radio GSM Full-Rate Vocoder Package: python-gnuradio-qtgui Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= ${binary:Version}), python-gnuradio-core +Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core Section: python Provides: ${python:Provides} XB-Python-Version: ${python:Versions} @@ -646,8 +646,8 @@ Description: Software Defined Radio Package: libgnuradio Section: libs Architecture: all -Depends: libgnuradio-core (= ${binary:Version}), -Recommends: libgnuradio-audio-alsa, libgnuradio-cvsd-vocoder, libgnuradio-gsm-fr-vocoder, libgnuradio-pager, libgnuradio-qtqui, libgnuradio-trellis, libgnuradio-usrp, libgnuradio-usrp2, libgnuradio-video-sdl +Depends: libgnuradio-core0 +Recommends: libgnuradio-audio-alsa0, libgnuradio-cvsd-vocoder0, libgnuradio-gsm-fr-vocoder0, libgnuradio-pager0, libgnuradio-qtqui0, libgnuradio-trellis0, libgnuradio-usrp0, libgnuradio-usrp20, libgnuradio-video-sdl0 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, @@ -656,7 +656,7 @@ Description: GNU Radio C++ API libraries Package: libgnuradio-dev Section: libdevel Architecture: all -Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev +Depends: libgnuradio0 (= ${binary:Version}), libgnuradio-core-dev Recommends: libgnuradio-audio-alsa-dev, libgnuradio-cvsd-vocoder-dev, libgnuradio-gsm-fr-vocoder-dev, libgnuradio-pager-dev, libgnuradio-qtgui-dev, libgnuradio-trellis-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev, libgnuradio-video-sdl-dev Suggests: gnuradio-doc, usrp-doc Replaces: gnuradio-dev diff --git a/debian/copyright b/debian/copyright index d93151a45..05b60abae 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ upstream restructuring on Wed, 6 Sep 2006 16:02:03 -0600. Much was learned and portions were taken from the previous Debian packages built by Ramakrishnan Muthukrishnan and Steinar H. Gunderson. -GNU Radio was downloaded from http://www.gnu.org/software/gnuradio/ +GNU Radio was downloaded from http://gnuradio.org/ Upstream Authors: Eric Blossom <eb@comsec.com> @@ -16,11 +16,156 @@ The current upstream maintainer is Johnathan Corgan. Copyright: GNU Radio is copyrighted by the Free Software Foundation and is licensed -under the GNU General Public License (GPL), a copy of which is available -on a Debian system at: +under the GNU General Public License (GPL), version 3 or later, a copy of +which is available on a Debian system at: /usr/share/common-licenses/GPL -The Debian packaging was created by Bdale Garbee <bdale@gag.com>, is -(c) Copyright 2006 Hewlett-Packard Development Company, L.P., -and is made available under the terms of the GPL. +The GNU Radio source distribution also incorporates a few components that +carry other copyrights and license assertions, as follows: + +gcell/ibm/sync/ppu_source/* +gcell/ibm/sync/spu_source/* + (C)Copyright 2001,2007, + International Business Machines Corporation, + Sony Computer Entertainment, Incorporated, + Toshiba Corporation, + + All Rights Reserved. + + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the + following conditions are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + + - Neither the name of IBM Corporation nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The gcell subsystem is not included in Debian binary package builds. + +gnuradio-core/src/lib/g72x/* + This source code is released by Sun Microsystems, Inc. to the public + domain. Please give your acknowledgement in product literature if + this code is used in your product implementation. + +gnuradio-core/src/lib/general/malloc16.c + Copyright 2001 Phil Karn, KA9Q + May be used under the terms of the GNU Public License (GPL) + +gnuradio-core/src/lib/reed-solomon/* + Copyright 2002, Phil Karn, KA9Q + May be used under the terms of the GNU Public License (GPL) + +*.{qpf,qsf} + Copyright (C) 1991-2004 Altera Corporation + Any megafunction design, and related netlist (encrypted or decrypted), + support information, device programming or simulation file, and any + other associated documentation or information provided by Altera or + a partner under Altera's Megafunction Partnership Program may be used + only to program PLD devices (but not masked PLD devices) from Altera. + Any other use of such megafunction design, netlist, support + information, device programming or simulation file, or any other + related documentation or information is prohibited for any other + purpose, including, but not limited to modification, reverse + engineering, de-compiling, or use with any other silicon devices, + unless such use is explicitly licensed under a separate agreement with + Altera or a megafunction partner. Title to the intellectual property, + including patents, copyrights, trademarks, trade secrets, or maskworks, + embodied in any such megafunction design, netlist, support information, + device programming or simulation file, or any other related + documentation or information provided by Altera or a megafunction + partner, remains with Altera, the megafunction partner, or their + respective licensors. No other licenses, including any licenses needed + under any third party's intellectual property, are provided herein. + + Thesea are configuration files generated by Altera proprietary tools + used in the creation of an open hardware design often used with GNU + Radio, and for which GNU Radio includes device drivers. These files + are not used in the Debian package build process. + +gr-gsm-fr-vocoders/src/lib/gsm/* + Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann, + Technische Universitaet Berlin + + Permission to use, copy, modify, and distribute this software + for any purpose with or without fee is hereby granted, + provided that this notice is not removed and that neither + the authors nor the Technische Universitaet Berlin are + deemed to have made any representations as to the suitability + of this software for any purpose nor are held responsible + for any defects of this software. THERE IS ABSOLUTELY NO + WARRANTY FOR THIS SOFTWARE. + +gruel/src/include/gruel/thread_group.h + Copyright (C) 2001-2003 William E. Kempf + Copyright (C) 2007 Anthony Williams + Copyright 2008 Free Software Foundation, Inc. + + The original was distributed under the Boost Software License, + Version 1.0, but this derivative work is now covered by the overall + license assertion for GNU Radio. + +gnuradio-core/src/lib/general/gr_remez.cc + Copyright (c) 1995,1998 Jake Janovetz (janovetz@uiuc.edu) + Copyright (c) 2004 Free Software Foundation, Inc. + + The original was distributed under LGPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +gr-gpio/src/fpga/include/common_config*.vh + Copyright (C) 2006,2007 Matt Ettus + Copyright (C) 2008 Corgan Enterprises LLC + + The original was distributed under GPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +gr-wxgui/src/python/plot.py + (C) 2002, 2007 Gordon Williams + + The original was licensed "Use as you wish", this derivative work + is now covered by the overall license assertion for GNU Radio. + +gr-wxgui/src/python/plotter/gltext.py + Copyright (C) 2007 Christian Brugger, Stefan Hacker + + The original was distributed under GPL version 2 or later, this + derivative work is now covered by the overall license assertion + for GNU Radio. + +Various files in the omnithread library carry these copyrights: + Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 1994,1995,1996,1997 Olivetti & Oracle Research Laboratory + Copyright Wavetek Wandel & Goltermann, Plymouth. + Copyright (C) 1994,1995,1996, 1997 Immisch, becker & Partner + Copyright (C) 1998 Steven Brennes + Copyright (C) 1995-1999 AT&T Laboratories Cambridge + + The original omnithread library was distributed under LGPL version 2 + or later, this derivative work is now covered by the overall license + assertion for GNU Radio. + diff --git a/debian/custom/libusrp.udev b/debian/custom/libusrp0.udev index e45dc294a..e45dc294a 100644 --- a/debian/custom/libusrp.udev +++ b/debian/custom/libusrp0.udev diff --git a/debian/custom/libusrp2.limits b/debian/custom/libusrp2-0.limits index f259b2992..f259b2992 100644 --- a/debian/custom/libusrp2.limits +++ b/debian/custom/libusrp2-0.limits diff --git a/debian/custom/usrp.hotplug b/debian/custom/usrp.hotplug deleted file mode 100644 index e8b943204..000000000 --- a/debian/custom/usrp.hotplug +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh - -GROUP=usrp - -# Set the permissions for the USRP devices right. -set_permissions() { - if [ -f "$1" ] - then - if getent group $GROUP > /dev/null; then - chmod 660 "$DEVICE" - chown root.$GROUP "$1" - fi - fi -} - -# -# If we do not have /sbin/hotplug, we are being called by post-sarge udev -# emulating hotplug. In that case, all of this is handled by our udev rules, -# so we don't need to duplicate the work done here. -# -if ! [ -x /sbin/hotplug ]; then - exit -fi - -if [ "$ACTION" != "add" ]; then - exit -fi - -# FIXME: Map the USB device ID to usrper's idea of "which USRP". -# For now, we just assume the user only has a single one. - -case $PRODUCT in - # USRP without loaded firmware - fffe/2/2 | fffe/2/4) - sleep 1 # required on some machines - /usr/bin/usrper load_standard_bits - set_permissions "$DEVICE" - ;; - - # USRP with loaded firmware - fffe/2/102 | fffe/2/104) - set_permissions "$DEVICE" - ;; -esac - - - diff --git a/debian/libgnuradio-core.dirs b/debian/libgnuradio-core0.dirs index 3462501c0..3462501c0 100644 --- a/debian/libgnuradio-core.dirs +++ b/debian/libgnuradio-core0.dirs diff --git a/debian/libgnuradio-core.install b/debian/libgnuradio-core0.install index e5c1d708c..e5c1d708c 100644 --- a/debian/libgnuradio-core.install +++ b/debian/libgnuradio-core0.install diff --git a/debian/libgnuradio-omnithread-dev.dirs b/debian/libgromnithread-dev.dirs index 79e3d4273..79e3d4273 100644 --- a/debian/libgnuradio-omnithread-dev.dirs +++ b/debian/libgromnithread-dev.dirs diff --git a/debian/libgnuradio-omnithread-dev.install b/debian/libgromnithread-dev.install index 3ebc34158..3ebc34158 100644 --- a/debian/libgnuradio-omnithread-dev.install +++ b/debian/libgromnithread-dev.install diff --git a/debian/libgnuradio-omnithread.install b/debian/libgromnithread0.install index 8910fb392..8910fb392 100644 --- a/debian/libgnuradio-omnithread.install +++ b/debian/libgromnithread0.install diff --git a/debian/libgruel.install b/debian/libgruel0.install index 54d2b998c..54d2b998c 100644 --- a/debian/libgruel.install +++ b/debian/libgruel0.install diff --git a/debian/libmblock.install b/debian/libmblock0.install index cc789522d..cc789522d 100644 --- a/debian/libmblock.install +++ b/debian/libmblock0.install diff --git a/debian/libusrp-inband.install b/debian/libusrp-inband.install deleted file mode 100644 index f55f21485..000000000 --- a/debian/libusrp-inband.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libusrp-inband.la -usr/lib/libusrp-inband.so.* diff --git a/debian/libusrp.postrm b/debian/libusrp.postrm deleted file mode 100644 index 268d741c3..000000000 --- a/debian/libusrp.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -set -e - -if [ "$1" != "remove" ]; then - exit 0 -fi - -/sbin/ldconfig -exit 0 diff --git a/debian/libusrp.dirs b/debian/libusrp0.dirs index cb9eb4204..cb9eb4204 100644 --- a/debian/libusrp.dirs +++ b/debian/libusrp0.dirs diff --git a/debian/libusrp.install b/debian/libusrp0.install index 1cabb1ff4..1cabb1ff4 100644 --- a/debian/libusrp.install +++ b/debian/libusrp0.install diff --git a/debian/libusrp.postinst b/debian/libusrp0.postinst index 48da2b3a4..562b9232e 100644 --- a/debian/libusrp.postinst +++ b/debian/libusrp0.postinst @@ -11,5 +11,6 @@ if ! getent group usrp >/dev/null; then addgroup --system usrp fi -ldconfig +#DEBHELPER# + exit 0 diff --git a/debian/libusrp2.dirs b/debian/libusrp2-0.dirs index 6c09e0d5c..6c09e0d5c 100644 --- a/debian/libusrp2.dirs +++ b/debian/libusrp2-0.dirs diff --git a/debian/libusrp2.install b/debian/libusrp2-0.install index dfe91f8b8..1c5963ab7 100644 --- a/debian/libusrp2.install +++ b/debian/libusrp2-0.install @@ -2,4 +2,4 @@ usr/lib/libusrp2.la usr/lib/libusrp2.so.* usr/bin/usrp2_socket_opener usr/bin/find_usrps -etc/security/limits.d/libusrp2.limits +etc/security/limits.d/libusrp2-0.limits diff --git a/debian/libusrp2.postinst b/debian/libusrp2-0.postinst index 91b9e11bf..8da31a3cd 100644 --- a/debian/libusrp2.postinst +++ b/debian/libusrp2-0.postinst @@ -12,7 +12,9 @@ if ! getent group usrp >/dev/null; then fi # Create setuid root for group usrp on socket opener -chown root.usrp /usr/bin/usrp2_socket_opener +chown root:usrp /usr/bin/usrp2_socket_opener chmod 04750 /usr/bin/usrp2_socket_opener -ldconfig + +#DEBHELPER# + exit 0 diff --git a/debian/libusrp2.postrm b/debian/libusrp2.postrm deleted file mode 100644 index 268d741c3..000000000 --- a/debian/libusrp2.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -set -e - -if [ "$1" != "remove" ]; then - exit 0 -fi - -/sbin/ldconfig -exit 0 diff --git a/debian/rules b/debian/rules index 1fc459280..f0dcd538d 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ export DH_OPTIONS export DH_PYCENTRAL=nomove +DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + clean: dh_testdir dh_testroot @@ -37,6 +39,7 @@ configure-stamp: dh_testdir [ -f ./configure ] || ./bootstrap ./configure \ + --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ @@ -46,7 +49,7 @@ configure-stamp: --disable-gr-audio-osx \ --disable-gr-audio-windows \ --disable-gcell --disable-gr-gcell \ - --disable-gr-comedi --disable-usrp2-firmware + --disable-gr-comedi --disable-usrp2-firmware touch configure-stamp build: build-stamp @@ -59,7 +62,8 @@ build-stamp: configure-stamp extract: extract-stamp extract-stamp: build-stamp debian/bin/gen-install-files.sh dh_testdir - debian/bin/gen-install-files.sh + chmod +x debian/bin/gen-install-files.sh debian/bin/extract-install-filenames + debian/bin/gen-install-files.sh touch $@ install: install-stamp @@ -79,12 +83,12 @@ install-stamp: extract-stamp debian/control done : # Deposit rule to allow group 'usrp' access to USRP hardware - install -m 0644 -D debian/custom/libusrp.udev \ + install -m 0644 -D debian/custom/libusrp0.udev \ debian/tmp/etc/udev/rules.d/40-usrp.rules : # Deposit rule to allow group 'usrp' access to USRP2 hardware - install -m 0644 -D debian/custom/libusrp2.limits \ - debian/tmp/etc/security/limits.d/libusrp2.limits + install -m 0644 -D debian/custom/libusrp2-0.limits \ + debian/tmp/etc/security/limits.d/libusrp2-0.limits : # Install custom grc.conf install -m 0644 -D debian/custom/grc.conf \ |