Merged r11074:11077 from jcorgan/deb in to trunk. Ubuntu packaging for 3.2 done, except for gr-msdd6000. Ready for testing.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11078 221aa14e-8319-0410-a670-987f0aec2ac5

9 files changed, 173 insertions, 86 deletions

diff --git a/debian/control b/debian/control
index 7780a392a..6b0646288 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: comm
 Priority: optional
 Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, 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-gtk2, python-lxml
+Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, 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
 Standards-Version: 3.7.2
 XS-Python-Version: = 2.6
 
@@ -88,7 +88,7 @@ Section: libs
 Architecture: any
 Replaces: libmblock0c2a
 Conflicts: libmblock0c2a
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends}
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends}, guile-1.8
 Description: GNU Radio Message Block Library 
  This package provides the GNU Radio message block library. 
 
@@ -112,6 +112,7 @@ Section: comm
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: libusrp0, libusrp0c2a, usrp-firmware
+Conflicts: usrp-firmware
 Suggests: usrp-doc
 Description: Client side library for the USRP(1) hardware
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
@@ -279,7 +280,7 @@ Architecture: any
 Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends}
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for the USRP library
  This package provides auxiliary routines in Python for manipulating the USRP
  hardware.
@@ -294,18 +295,18 @@ Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
 Conflicts: python-gnuradio (< 3.2)
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio core library
  This package provides the modules that enable one to use gnuradio 
  from Python scripts.
 
 Package: python-gnuradio-wxgui
 Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl
+Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), python-wxgtk2.8, python-opengl, python-numpy
 Conflicts: python-wxgtk2.6
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Graphical Interface Routines based on wxPython
  This package provides high level GUI construction classes based
  upon the wxPython bindings for wxWidgets.
@@ -315,7 +316,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -325,7 +326,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -335,7 +336,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio ALSA
  audio driver.
@@ -345,7 +346,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}, python-gnuradio-audio
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python PortAudio Driver
  This package provides the Python interface to the GNU Radio driver
  for the PortAudio audio system.
@@ -355,7 +356,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python JACK Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the JACK audio system.
@@ -365,7 +366,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python OSS Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the OSS audio system.
@@ -375,7 +376,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio CVSD Vocoder
  This package provides an implementation of a CVSD vocoder for
  GNU Radio.
@@ -385,7 +386,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio GSM Full-Rate Vocoder
  This package provides an implementation of a full-rate GSM vocoder 
  for GNU Radio.
@@ -395,7 +396,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio QT
  GUI C++ blocks.
@@ -405,7 +406,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Trellis-Coded Modulation library
  This package provides an implementation of trellis-coded modulation
  for GNU Radio.
@@ -415,7 +416,7 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio SDL Interface Library
  This package provides an interface to the SDL rendering library
  for GNU Radio.
@@ -429,7 +430,7 @@ 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}
+XB-Python-Version: 2.6
 Description: GNU Radio Utilities
  This package provides commonly used utilities for GNU Radio
 
@@ -438,10 +439,64 @@ Architecture: any
 Depends: ${python:Depends}, python-gnuradio-core
 Recommends: python-gnuradio-wxgui, python-gnuradio
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Example Programs
  This package provides examples of GNU Radio usage using Python.
 
+Package: gnuradio-pager
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: 2.6
+Description: GNU Radio FLEX Pager Decoder
+ This package provides a decoder for the FLEX paging protocol for GNU Radio
+
+Package: gnuradio-sounder
+Architecture: any
+Replaces: gnuradio-sounder-firmware
+Conflicts: gnuradio-sounder-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: 2.6
+Description: GNU Radio Channel Sounder Application
+ This package provides an RF channel sounder application for GNU Radio
+
+Package: gnuradio-gpio
+Architecture: any
+Replaces: gnuradio-gpio-firmware
+Conflicts: gnuradio-gpio-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: 2.6
+Description: GNU Radio Streaming Digital Application
+ This package provides streaming digital GPIO capabilities for GNU Radio
+
+Package: gnuradio-radar-mono
+Architecture: any
+Replaces: gnuradio-radar-mono-firmware
+Conflicts: gnuradio-radar-mono-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: 2.6
+Description: GNU Radio Monostatic Radar Application
+ This package provides a monostatic radar application for GNU Radio
+
+Package: gnuradio-radio-astronomy
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
+Section: comm
+XB-Python-Version: 2.6
+Description: GNU Radio Radio Astronomy Applications
+ This package provides radio astronomy applications for GNU Radio
+
+Package: grc
+Architecture: any
+Depends: python (>= 2.6), python-gnuradio
+Section: comm
+XB-Python-Version: 2.6
+Description: The GNU Radio Companion
+ GRC is a graphical flowgraph editor for the GNU Software Radio
+
 ################################################################################
 # Documentation packages                                                       #
 ################################################################################
@@ -492,15 +547,23 @@ 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}
+XB-Python-Version: 2.6
 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-apps
+Section: comm
+Architecture: all
+Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder, gnuradio-radio-astronomy, gnuradio-radar-mono
+Description: The GNU Software Radio Toolkit - applications
+ This is a virtual package that depends on top-level GNU Radio application
+ packages.
+
 Package: gnuradio
 Section: comm
 Architecture: all
-Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples
+Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples, gnuradio-apps
 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 522ef07c9..2fc0e7775 100755
--- a/debian/gen-install-files.sh
+++ b/debian/gen-install-files.sh
@@ -301,56 +301,80 @@ $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
+# gnuradio-pager
+NAME=debian/gnuradio-pager.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-gpio/src/python/Makefile bin_SCRIPTS >>$NAME
-$EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES |
+$EXTRACT gr-pager/src/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_python_PYTHON >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES |
     sed -e 's/\.la$/.so/' >>$NAME
-echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME
-echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME
 
-# gnuradio-pager
-NAME=debian/gnuradio-pager.install
+# gnuradio-sounder
+NAME=debian/gnuradio-sounder.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-pager/src/Makefile bin_SCRIPTS >>$NAME
-$EXTRACT gr-pager/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-pager/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-pager/src/Makefile ourlib_LTLIBRARIES |
-    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gr-sounder/src/python/Makefile sounder_python_PYTHON >>$NAME
+$EXTRACT gr-sounder/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_sounder.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_sounder.rbf >>$NAME
 
-# gnuradio-radio-astronomy
-NAME=debian/gnuradio-radio-astronomy.install
+# gnuradio-gpio
+NAME=debian/gnuradio-gpio.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-radio-astronomy/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-radio-astronomy/src/python/Makefile wxguipython_PYTHON >>$NAME
-$EXTRACT gr-radio-astronomy/src/python/Makefile bin_SCRIPTS >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourlib_LTLIBRARIES |
-    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gr-gpio/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME
+echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME
+echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME
 
 # gnuradio-radar-mono
 NAME=debian/gnuradio-radar-mono.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gr-radar-mono/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-radar-mono/src/python/Makefile bin_SCRIPTS >>$NAME
+$EXTRACT gr-radar-mono/src/python/Makefile dist_bin_SCRIPTS >>$NAME
 echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
 echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME
 
-# gnuradio-sounder
-NAME=debian/gnuradio-sounder.install
+# gnuradio-radio-astronomy
+NAME=debian/gnuradio-radio-astronomy.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-sounder/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-sounder/src/python/Makefile bin_SCRIPTS >>$NAME
-echo usr/share/usrp/rev2/usrp_sounder.rbf
-echo usr/share/usrp/rev4/usrp_sounder.rbf
+$EXTRACT gr-radio-astronomy/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/python/Makefile wxguipython_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_python_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES |
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# grc
+NAME=debian/grc.install
+rm -f $NAME
+touch $NAME
+$EXTRACT grc/data/platforms/base/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/blocks/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_audiodata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_simpledata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_trellisdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_usrpdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_xmlrpcdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/scripts/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/src/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/blks2/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/usrp/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile oursubpython_PYTHON >>$NAME
+$EXTRACT grc/src/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/base/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/utils/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/utils/Makefile ourpython_PYTHON >>$NAME
diff --git a/debian/pyversions b/debian/pyversions
index 95e3ba819..c20c8ac5c 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.5
+2.6
\ No newline at end of file
diff --git a/dtools/bin/extract_install_filenames b/dtools/bin/extract_install_filenames
index 70465b44d..8ffce9db1 100755
--- a/dtools/bin/extract_install_filenames
+++ b/dtools/bin/extract_install_filenames
@@ -84,12 +84,12 @@ def main():
     target_files = make.readline().rstrip()
     if target_dirname.startswith('/'):
         target_dirname = target_dirname[1:]
-    
+   
     #print "target_dirname =", target_dirname
     #print "target_files =", target_files
 
     for f in target_files.split():
-        sys.stdout.write(os.path.join(target_dirname, f) + '\n')
+        sys.stdout.write(os.path.join(target_dirname, f.split('/')[-1]) + '\n')
 
 if __name__ == '__main__':
   main()
diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.am b/gnuradio-examples/python/apps/hf_radio/Makefile.am
index 70b516d5d..e514076f6 100644
--- a/gnuradio-examples/python/apps/hf_radio/Makefile.am
+++ b/gnuradio-examples/python/apps/hf_radio/Makefile.am
@@ -26,14 +26,14 @@ ourdatadir = $(exampledir)/hf_radio
 dist_ourdata_DATA = 	\
     hfir.sci	\
     radio.xml	\
-    README.TXT	\
-    ssb_taps
-
-dist_ourdata_SCRIPTS = 	\
     input.py	\
     output.py	\
-    radio.py	\
+    README.TXT	\
     ssbagc.py	\
     ssbdemod.py \
     startup.py	\
+    ssb_taps
+
+dist_ourdata_SCRIPTS = 	\
+    radio.py	\
     ui.py
diff --git a/gnuradio-examples/python/digital-bert/Makefile.am b/gnuradio-examples/python/digital-bert/Makefile.am
index eda014a1c..eac013f09 100644
--- a/gnuradio-examples/python/digital-bert/Makefile.am
+++ b/gnuradio-examples/python/digital-bert/Makefile.am
@@ -23,11 +23,11 @@ include $(top_srcdir)/Makefile.common
 
 ourdatadir = $(exampledir)/digital-bert
 
-dist_ourdata_DATA = \
-	README
+dist_ourdata_DATA = 		\
+	README			\
+	receive_path.py		\
+	transmit_path.py
 
 dist_ourdata_SCRIPTS =		\
 	benchmark_rx.py		\
-	benchmark_tx.py		\
-	receive_path.py		\
-	transmit_path.py
+	benchmark_tx.py
\ No newline at end of file
diff --git a/gnuradio-examples/python/digital-bert/transmit_path.py b/gnuradio-examples/python/digital-bert/transmit_path.py
index 47b6ab229..96834b398 100644
--- a/gnuradio-examples/python/digital-bert/transmit_path.py
+++ b/gnuradio-examples/python/digital-bert/transmit_path.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # Copyright 2008 Free Software Foundation, Inc.
 #
diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am
index 64a866590..97e586a70 100644
--- a/gnuradio-examples/python/digital/Makefile.am
+++ b/gnuradio-examples/python/digital/Makefile.am
@@ -23,22 +23,22 @@ include $(top_srcdir)/Makefile.common
 
 ourdatadir = $(exampledir)/digital
 
-dist_ourdata_DATA =	\
-	README
+dist_ourdata_DATA =		\
+	README			\
+	generic_usrp.py		\
+	pick_bitrate.py		\
+	receive_path.py		\
+	receive_path_lb.py	\
+	transmit_path.py	\
+	transmit_path_lb.py	\
+	usrp_options.py
 
 dist_ourdata_SCRIPTS =		\
 	benchmark_loopback.py   \
 	benchmark_rx.py		\
 	benchmark_tx.py		\
 	gen_whitener.py		\
-	generic_usrp.py		\
-	pick_bitrate.py		\
-	receive_path.py		\
-	receive_path_lb.py	\
 	rx_voice.py		\
 	run_length.py		\
-	transmit_path.py	\
-	transmit_path_lb.py	\
 	tunnel.py		\
-	tx_voice.py             \
-	usrp_options.py
+	tx_voice.py
diff --git a/gnuradio-examples/python/ofdm/Makefile.am b/gnuradio-examples/python/ofdm/Makefile.am
index a42d4017d..fc7156b4c 100644
--- a/gnuradio-examples/python/ofdm/Makefile.am
+++ b/gnuradio-examples/python/ofdm/Makefile.am
@@ -23,19 +23,20 @@ include $(top_srcdir)/Makefile.common
 
 ourdatadir = $(exampledir)/ofdm
 
-dist_ourdata_DATA =	\
-	ofdm_sync.m	\
-	ofdm_sync_pn.m	\
-	plot_ofdm.m
+dist_ourdata_DATA =		\
+	ofdm_sync.m		\
+	ofdm_sync_pn.m		\
+	fusb_options.py		\
+	plot_ofdm.m		\
+	pick_bitrate.py		\
+	receive_path.py		\
+	transmit_path.py
 
 dist_ourdata_SCRIPTS =		\
 	benchmark_ofdm.py	\
 	benchmark_ofdm_rx.py	\
 	benchmark_ofdm_tx.py	\
 	fftshift.py		\
-	fusb_options.py		\
-	pick_bitrate.py		\
-	receive_path.py		\
-	transmit_path.py	\
 	ofdm_mod_demod_test.py	\
 	tunnel.py
+