[Commit-gnuradio] r7824 - gnuradio/branches/releases/3.1/debian

[jcorgan]

Author: jcorgan
Date: 2008-02-24 13:49:49 -0700 (Sun, 24 Feb 2008)
New Revision: 7824

Added:
   gnuradio/branches/releases/3.1/debian/gnuradio-gpio-firmware.install
Modified:
   gnuradio/branches/releases/3.1/debian/control
   gnuradio/branches/releases/3.1/debian/gen-install-files.sh
Log:
Applied changeset r7822-7823 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/debian/control
===================================================================
--- gnuradio/branches/releases/3.1/debian/control       2008-02-24 20:14:03 UTC 
(rev 7823)
+++ gnuradio/branches/releases/3.1/debian/control       2008-02-24 20:49:49 UTC 
(rev 7824)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Johnathan Corgan <address@hidden>
 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
 
@@ -315,6 +315,23 @@
 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

Modified: gnuradio/branches/releases/3.1/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/releases/3.1/debian/gen-install-files.sh  2008-02-24 
20:14:03 UTC (rev 7823)
+++ gnuradio/branches/releases/3.1/debian/gen-install-files.sh  2008-02-24 
20:49:49 UTC (rev 7824)
@@ -34,7 +34,7 @@
 $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/blks2impl/Makefile 
grblks2python_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON 
>>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON 
>>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile 
grvocoderpython_PYTHON >>$NAME
@@ -71,6 +71,7 @@
 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
@@ -171,6 +172,7 @@
 NAME=debian/gnuradio-utils.install
 rm -f $NAME
 touch $NAME
+$EXTRACT gr-utils/src/python/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-utils/src/python/Makefile bin_SCRIPTS >>$NAME
 
 # gnuradio-examples
@@ -186,6 +188,16 @@
 $EXTRACT gnuradio-examples/python/network/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

Copied: gnuradio/branches/releases/3.1/debian/gnuradio-gpio-firmware.install 
(from rev 7823, gnuradio/trunk/debian/gnuradio-gpio-firmware.install)
===================================================================
--- gnuradio/branches/releases/3.1/debian/gnuradio-gpio-firmware.install        
                        (rev 0)
+++ gnuradio/branches/releases/3.1/debian/gnuradio-gpio-firmware.install        
2008-02-24 20:49:49 UTC (rev 7824)
@@ -0,0 +1,2 @@
+usr/share/usrp/rev2/usrp_gpio.rbf
+usr/share/usrp/rev4/usrp_gpio.rbf