Catch up Debian packages

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

4 files changed, 34 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index e4f514581..b9e7a58eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-gnuradio (3.1.svn-6834) unstable; urgency=low
+gnuradio (3.1.svn-7817) unstable; urgency=low
 
   * post release 3.1 trunk repository packages
   * see http://gnuradio.org/trac/wiki for stable branch
 
- -- Johnathan Corgan <jcorgan@corganenterprises.com>  Mon,  5 Nov 2007 18:12:00 -0800
+ -- Johnathan Corgan <jcorgan@corganenterprises.com>  Mon,  24 Feb 2008 18:12:00 -0800
 
 gnuradio (3.0.svn) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index eefae78f3..f8bc0fdde 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: comm
 Priority: optional
 Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev | libfftw3-dev, libasound2-dev, libboost-dev, libcppunit-dev, libjack0.100.0-dev, libsdl1.2-dev, portaudio19-dev, libtool, libusb-dev, pkg-config, python, python-all-dev, python-central (>= 0.5), python-numpy, python-wxgtk2.6, sdcc, swig, xmlto
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev | libfftw3-dev, libasound2-dev, libboost-dev, libcppunit-dev, libjack0.100.0-dev, libsdl1.2-dev, portaudio19-dev, libtool, libusb-dev, pkg-config, python, python-all-dev, python-central (>= 0.5), python-numpy, python-wxgtk2.8, sdcc, swig, xmlto
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
 
@@ -379,6 +379,23 @@ XB-Python-Version: ${python:Versions}
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
 
+Package: gnuradio-gpio-firmware
+Section: contrib/comm
+Architecture: all
+Description: GNU Radio Streaming GPIO Application
+ This package provides streaming digital GPIO capabilities for GNU Radio
+ .
+ This package contains the custom FPGA bitstrings for the USRP, which 
+ require non-free tools to build.
+
+Package: gnuradio-gpio
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-gpio-firmware
+Section: contrib/comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Streaming Digital Application
+ This package provides a streaming digital GPIO capabilities for GNU Radio
+
 Package: gnuradio-radar-mono-firmware
 Section: contrib/comm
 Architecture: all
diff --git a/debian/gen-install-files.sh b/debian/gen-install-files.sh
index e7a63b1a3..db0880013 100755
--- a/debian/gen-install-files.sh
+++ b/debian/gen-install-files.sh
@@ -38,9 +38,7 @@ $EXTRACT gnuradio-core/src/lib/swig/Makefile grgrlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 $EXTRACT gnuradio-core/src/lib/swig/Makefile grgrpython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gr/Makefile grgrpython_PYTHON >>$NAME
-$EXTRACT gnuradio-core/src/python/gnuradio/blks/Makefile grblkspython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/blks2/Makefile grblks2python_PYTHON >>$NAME
-$EXTRACT gnuradio-core/src/python/gnuradio/blksimpl/Makefile grblkspython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/blks2impl/Makefile grblkspython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON >>$NAME
@@ -84,6 +82,7 @@ rm -f $NAME
 touch $NAME
 echo etc/gnuradio/conf.d/gr-wxgui.conf >>$NAME
 $EXTRACT gr-wxgui/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME
 
 # python-gnuradio-atsc
 NAME=debian/python-gnuradio-atsc.install
@@ -194,6 +193,7 @@ $EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES | \
 NAME=debian/gnuradio-utils.install
 rm -f $NAME
 touch $NAME
+$EXTRACT gr-utils/src/python/Makefile outpython_PYTHON >>$NAME
 $EXTRACT gr-utils/src/python/Makefile bin_SCRIPTS >>$NAME
 
 # gnuradio-examples
@@ -212,6 +212,16 @@ $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
 
+# gnuradio-gpio
+NAME=debian/gnuradio-gpio.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 |
+    sed -e 's/\.la$/.so/' >>$NAME
+
 # gnuradio-pager
 NAME=debian/gnuradio-pager.install
 rm -f $NAME
diff --git a/debian/gnuradio-gpio-firmware.install b/debian/gnuradio-gpio-firmware.install
new file mode 100644
index 000000000..11f3b105d
--- /dev/null
+++ b/debian/gnuradio-gpio-firmware.install
@@ -0,0 +1,2 @@
+usr/share/usrp/rev2/usrp_gpio.rbf
+usr/share/usrp/rev4/usrp_gpio.rbf