From d61290df87a1894d735de7a5734cefd24869d12f Mon Sep 17 00:00:00 2001 From: jcorgan Date: Wed, 20 May 2009 15:35:55 +0000 Subject: [PATCH] Merged r11045:11059 from jcorgan/deb into trunk. Updates on Ubuntu binary packaging; also fixes missing files in digital example directory. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11072 221aa14e-8319-0410-a670-987f0aec2ac5 --- debian/control | 188 +++++++++++++----- debian/gen-install-files.sh | 116 ++++++----- debian/libusrp.postrm | 3 +- debian/libusrp2.postrm | 3 +- debian/rules | 32 +-- dtools/bin/extract_install_filenames | 6 +- .../python/digital-bert/Makefile.am | 3 + gnuradio-examples/python/digital/Makefile.am | 4 +- gnuradio-examples/python/mp-sched/Makefile.am | 3 + 9 files changed, 234 insertions(+), 124 deletions(-) diff --git a/debian/control b/debian/control index 3a2cf94f..7780a392 100644 --- a/debian/control +++ b/debian/control @@ -162,7 +162,7 @@ Package: libusrp2-dev Section: libdevel Architecture: any Depends: libusrp2 (= ${binary:Version}), libboost-thread1.37-dev, libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (= ${binary:Version}) -Description: Client side library for the USRP(1) hardware +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 and digital-to-analog converters, an FPGA and a microcontroller. It's @@ -302,6 +302,7 @@ Description: Python bindings for GNU Radio core library Package: python-gnuradio-wxgui Architecture: any Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl +Conflicts: python-wxgtk2.6 Provides: ${python:Provides} Section: python XB-Python-Version: ${python:Versions} @@ -309,6 +310,26 @@ Description: GNU Radio Graphical Interface Routines based on wxPython This package provides high level GUI construction classes based upon the wxPython bindings for wxWidgets. +Package: python-gnuradio-usrp +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio USRP driver + This package provides the Python interface to the GNU Radio USRP + driver and daughterboard drivers. + +Package: python-gnuradio-usrp2 +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio USRP driver + This package provides the Python interface to the GNU Radio USRP + driver and daughterboard drivers. + Package: python-gnuradio-audio-alsa Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= ${binary:Version}), python-gnuradio-core @@ -349,54 +370,77 @@ Description: GNU Radio Python OSS Audio Driver This package provides the Python interface to the GNU Radio driver for the OSS audio system. -#Package: python-gnuradio-atsc -#Architecture: any -#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core -#Provides: ${python:Provides} -#Section: python -#XB-Python-Version: ${python:Versions} -#Description: GNU Radio ATSC Receiver -# This package provides a decoder for ATSC waveforms using GNU Radio. - -#Package: python-gnuradio-cvsd-vocoder -#Architecture: any -#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core -#Provides: ${python:Provides} -#Section: python -#XB-Python-Version: ${python:Versions} -#Description: GNU Radio CVSD Vocoder -# This package provides an implementation of a CVSD vocoder for -# GNU Radio. - -#Package: python-gnuradio-gsm-fr-vocoder -#Architecture: any -#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core -#Provides: ${python:Provides} -#Section: python -#XB-Python-Version: ${python:Versions} -#Description: GNU Radio GSM Full-Rate Vocoder -# This package provides an implementation of a full-rate GSM vocoder -# for GNU Radio. - -#Package: python-gnuradio-trellis -#Architecture: any -#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core -#Provides: ${python:Provides} -#Section: python -#XB-Python-Version: ${python:Versions} -#Description: GNU Radio Trellis-Coded Modulation library -# This package provides an implementation of trellis-coded modulation -# for GNU Radio. - -#Package: python-gnuradio-video-sdl -#Architecture: any -#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core -#Provides: ${python:Provides} -#Section: python -#XB-Python-Version: ${python:Versions} -#Description: GNU Radio SDL Interface Library -# This package provides an interface to the SDL rendering library -# for GNU Radio. +Package: python-gnuradio-cvsd-vocoder +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio CVSD Vocoder + This package provides an implementation of a CVSD vocoder for + GNU Radio. + +Package: python-gnuradio-gsm-fr-vocoder +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio GSM Full-Rate Vocoder + This package provides an implementation of a full-rate GSM vocoder + for GNU Radio. + +Package: python-gnuradio-qtgui +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= ${binary:Version}), python-gnuradio-core +Section: python +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings for GNU Radio ALSA audio driver + This package provides the Python wrappers around the GNU Radio QT + GUI C++ blocks. + +Package: python-gnuradio-trellis +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio Trellis-Coded Modulation library + This package provides an implementation of trellis-coded modulation + for GNU Radio. + +Package: python-gnuradio-video-sdl +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: GNU Radio SDL Interface Library + This package provides an interface to the SDL rendering library + for GNU Radio. + +################################################################################ +# GNU Radio Utilities, Examples, and Applications # +################################################################################ + +Package: gnuradio-utils +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-usrp2, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy +Provides: ${python:Provides} +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Utilities + This package provides commonly used utilities for GNU Radio + +Package: gnuradio-examples +Architecture: any +Depends: ${python:Depends}, python-gnuradio-core +Recommends: python-gnuradio-wxgui, python-gnuradio +Section: comm +XB-Python-Version: ${python:Versions} +Description: GNU Radio Example Programs + This package provides examples of GNU Radio usage using Python. ################################################################################ # Documentation packages # @@ -409,16 +453,54 @@ Description: Software Defined Radio This package contains the documentation for the GNU Radio software defined radio system. +Package: usrp-doc +Section: doc +Architecture: all +Description: Software Defined Radio + This package contains the documentation for the Universal Software Radio + Peripheral (USRP) hardware and interface library. + ################################################################################ # Meta-packages # ################################################################################ -Package: gnuradio-dev +Package: libgnuradio +Section: libs +Architecture: all +Depends: libgnuradio-core (= ${binary:Version}), +Recommends: libgnuradio-audio-alsa, libgnuradio-qtqui, libgnuradio-usrp, libgnuradio-usrp2 +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, + install libgnuradio-dev. + +Package: libgnuradio-dev Section: libdevel Architecture: all -Recommends: gnuradio-doc, libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev -Depends: libgnuradio-core-dev +Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev +Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, libgnuradio-usrp-dev, libgnuradio-usrp2-dev, +Suggests: gnuradio-doc, usrp-doc +Replaces: gnuradio-dev Description: Development headers for GNU Radio C++ development This is a virtual package that depends or recommends the development header - packages for the various GNU Radio components. It is only needed if you intend + packages for the GNU Radio C++ API. It is only needed if you intend to develop custom GNU Radio signal processing blocks in C++. + +Package: python-gnuradio +Section: python +Architecture: all +Depends: python-gnuradio-core +Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-qtgui, python-gnuradio-trellis, python-gnuradio-video-sdl, python-gnuradio-usrp, python-gnuradio-usrp2 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python Libraries for GNU Radio Components + This is a virtual package that depends or recommends all of the packages that + make up the GNU Radio Python API. + +Package: gnuradio +Section: comm +Architecture: all +Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples +Description: The GNU Software Radio Toolkit + This is a virtual package that installs the entire GNU Radio and USRP software + set. diff --git a/debian/gen-install-files.sh b/debian/gen-install-files.sh index d004612c..522ef07c 100755 --- a/debian/gen-install-files.sh +++ b/debian/gen-install-files.sh @@ -162,6 +162,24 @@ $EXTRACT gr-wxgui/src/python/Makefile ourpython_PYTHON >>$NAME $EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME $EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME +# python-gnuradio-usrp +NAME=debian/python-gnuradio-usrp.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_python_PYTHON >>$NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + +# python-gnuradio-usrp2 +NAME=debian/python-gnuradio-usrp2.install +rm -f $NAME +touch $NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_python_PYTHON >>$NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so/' >>$NAME + # python-gnuradio-audio-alsa NAME=debian/python-gnuradio-audio-alsa.install rm -f $NAME @@ -201,67 +219,54 @@ $EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES >>$NA $EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES | \ sed -e 's/\.la$/.so/' >>$NAME -exit 0 - -# python-gnuradio-atsc -NAME=debian/python-gnuradio-atsc.install -rm -f $NAME -touch $NAME -$EXTRACT gr-atsc/src/lib/Makefile atsc_python_PYTHON >>$NAME -$EXTRACT gr-atsc/src/lib/Makefile atsc_pylib_LTLIBRARIES >>$NAME -$EXTRACT gr-atsc/src/lib/Makefile atsc_pylib_LTLIBRARIES | \ - sed -e 's/\.la$/.so/' >>$NAME -$EXTRACT gr-atsc/src/python/Makefile dist_ourdata_SCRIPTS >>$NAME - -# python-gnuradio-usrp -NAME=debian/python-gnuradio-usrp.install -rm -f $NAME -touch $NAME -$EXTRACT gr-usrp/src/Makefile ourpython_PYTHON >>$NAME -$EXTRACT gr-usrp/src/Makefile ourlib_LTLIBRARIES >>$NAME -$EXTRACT gr-usrp/src/Makefile ourlib_LTLIBRARIES | \ - sed -e 's/\.la$/.so/' >>$NAME - # python-gnuradio-cvsd-vocoder NAME=debian/python-gnuradio-cvsd-vocoder.install rm -f $NAME touch $NAME $EXTRACT gr-cvsd-vocoder/src/python/Makefile grblkspython_PYTHON >>$NAME -$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourpython_PYTHON >>$NAME -$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME -$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \ +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_python_PYTHON >>$NAME +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES | \ sed -e 's/\.la$/.so/' >>$NAME # python-gnuradio-gsm-fr-vocoder -# TODO: break out libgnuradio-gsm-fr-vocoder NAME=debian/python-gnuradio-gsm-fr-vocoder.install rm -f $NAME touch $NAME -$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourpython_PYTHON >>$NAME -$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME -$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \ +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_python_PYTHON >>$NAME +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES | \ sed -e 's/\.la$/.so/' >>$NAME +# python-gnuradio-qtgui +NAME=debian/python-gnuradio-qtgui.install +rm -f $NAME +touch $NAME +$EXTRACT gr-qtgui/src/python/Makefile qtguipython_PYTHON >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_python_PYTHON >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES | \ + sed -e 's/\.la$/.so*/' >>$NAME + # python-gnuradio-trellis -# TODO: break out libgnuradio-trellis NAME=debian/python-gnuradio-trellis.install rm -f $NAME touch $NAME -$EXTRACT gr-trellis/src/lib/Makefile ourpython_PYTHON >>$NAME -$EXTRACT gr-trellis/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME -$EXTRACT gr-trellis/src/lib/Makefile ourlib_LTLIBRARIES | \ +$EXTRACT gr-trellis/src/lib/Makefile trellis_python_PYTHON >>$NAME +$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES | \ sed -e 's/\.la$/.so/' >>$NAME -$EXTRACT gr-trellis/src/examples/Makefile ourdata_DATA >>$NAME -$EXTRACT gr-trellis/src/examples/fsm_files/Makefile ourdata_DATA >>$NAME +$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gr-trellis/src/examples/fsm_files/Makefile dist_ourdata_DATA >>$NAME # python-gnuradio-video-sdl -# TODO: break out libgnuradio-video-sdl NAME=debian/python-gnuradio-video-sdl.install rm -f $NAME touch $NAME -$EXTRACT gr-video-sdl/src/Makefile ourpython_PYTHON >>$NAME -$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES >>$NAME -$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES | \ +$EXTRACT gr-video-sdl/src/Makefile video_sdl_python_PYTHON >>$NAME +$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES >>$NAME +$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES | \ sed -e 's/\.la$/.so/' >>$NAME # gnuradio-utils @@ -275,19 +280,28 @@ $EXTRACT gr-utils/src/python/Makefile bin_SCRIPTS >>$NAME NAME=debian/gnuradio-examples.install rm -f $NAME touch $NAME -$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/audio/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/digital/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/digital-bert/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/digital_voice/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/mp-sched/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/multi-antenna/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/multi_usrp/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/network/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/ofdm/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/usrp/Makefile ourdata_DATA >>$NAME -$EXTRACT gnuradio-examples/python/usrp2/Makefile ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/audio/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/digital_voice/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/multi-antenna/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/network/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_DATA >>$NAME +$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/usrp/Makefile dist_ourdata_SCRIPTS >>$NAME +$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_SCRIPTS >>$NAME + +exit 0 # gnuradio-gpio NAME=debian/gnuradio-gpio.install diff --git a/debian/libusrp.postrm b/debian/libusrp.postrm index 57cab931..268d741c 100644 --- a/debian/libusrp.postrm +++ b/debian/libusrp.postrm @@ -6,6 +6,5 @@ if [ "$1" != "remove" ]; then exit 0 fi -rm -f /etc/udev/rules.d/40-usrp.rules -ldconfig +/sbin/ldconfig exit 0 diff --git a/debian/libusrp2.postrm b/debian/libusrp2.postrm index 047c4803..268d741c 100644 --- a/debian/libusrp2.postrm +++ b/debian/libusrp2.postrm @@ -6,6 +6,5 @@ if [ "$1" != "remove" ]; then exit 0 fi -rm -f /etc/security/limits.d/libusrp2.limits -ldconfig +/sbin/ldconfig exit 0 diff --git a/debian/rules b/debian/rules index 490617c8..4a477732 100755 --- a/debian/rules +++ b/debian/rules @@ -34,31 +34,35 @@ configure: configure-stamp configure-stamp: dh_testdir [ -f ./configure ] || ./bootstrap - ./configure LDFLAGS="-Wl,--as-needed" \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --enable-shared \ - --enable-doxygen --enable-html-docs \ - --sysconfdir=/etc --enable-all-components \ - --disable-gr-audio-osx --disable-gr-audio-windows \ + ./configure \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --enable-shared \ + --sysconfdir=/etc \ + --enable-all-components \ + --enable-doxygen \ + --disable-gr-audio-osx \ + --disable-gr-audio-windows \ --disable-gcell --disable-gr-gcell \ --disable-gr-comedi --disable-usrp2-firmware touch configure-stamp -extract: extract-stamp -extract-stamp: configure-stamp debian/gen-install-files.sh - dh_testdir - debian/gen-install-files.sh - touch $@ - build: build-stamp -build-stamp: extract-stamp +build-stamp: configure-stamp $(MAKE) -j $(MAKE) check touch $@ +extract: extract-stamp +extract-stamp: build-stamp debian/gen-install-files.sh + dh_testdir + debian/gen-install-files.sh + touch $@ + install: install-stamp -install-stamp: build-stamp +install-stamp: extract-stamp debian/control dh_testdir dh_testroot dh_clean -k diff --git a/dtools/bin/extract_install_filenames b/dtools/bin/extract_install_filenames index d1520af0..70465b44 100755 --- a/dtools/bin/extract_install_filenames +++ b/dtools/bin/extract_install_filenames @@ -54,7 +54,11 @@ def main(): if suffix.upper() != suffix: raise SystemExit, "AM-variable-name is malformed. Expected something like grgrpython_PYTHON" - dirname = prefix + "dir" + if prefix[:5] == "dist_": + dirname = prefix[5:] + "dir" + else: + dirname = prefix + "dir" + #print "dirname =", dirname tail = make_makefile_tail(dirname, full_var_name) diff --git a/gnuradio-examples/python/digital-bert/Makefile.am b/gnuradio-examples/python/digital-bert/Makefile.am index 17b2de74..eda014a1 100644 --- a/gnuradio-examples/python/digital-bert/Makefile.am +++ b/gnuradio-examples/python/digital-bert/Makefile.am @@ -23,6 +23,9 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(exampledir)/digital-bert +dist_ourdata_DATA = \ + README + dist_ourdata_SCRIPTS = \ benchmark_rx.py \ benchmark_tx.py \ diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am index 20f27a5b..64a86659 100644 --- a/gnuradio-examples/python/digital/Makefile.am +++ b/gnuradio-examples/python/digital/Makefile.am @@ -31,6 +31,7 @@ dist_ourdata_SCRIPTS = \ benchmark_rx.py \ benchmark_tx.py \ gen_whitener.py \ + generic_usrp.py \ pick_bitrate.py \ receive_path.py \ receive_path_lb.py \ @@ -39,4 +40,5 @@ dist_ourdata_SCRIPTS = \ transmit_path.py \ transmit_path_lb.py \ tunnel.py \ - tx_voice.py + tx_voice.py \ + usrp_options.py diff --git a/gnuradio-examples/python/mp-sched/Makefile.am b/gnuradio-examples/python/mp-sched/Makefile.am index 4fc29b05..98fa283e 100644 --- a/gnuradio-examples/python/mp-sched/Makefile.am +++ b/gnuradio-examples/python/mp-sched/Makefile.am @@ -22,6 +22,9 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(exampledir)/mp-sched +dist_ourdata_DATA = \ + README + dist_ourdata_SCRIPTS = \ plot_flops.py \ run_synthetic.py \ -- 2.30.2