[Commit-gnuradio] r9917 - gnuradio/branches/developers/jcorgan/deb-wip/debian

[jcorgan]

Author: jcorgan
Date: 2008-11-03 12:52:52 -0700 (Mon, 03 Nov 2008)
New Revision: 9917

Removed:
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-gpio-firmware.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-radar-mono-firmware.install
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-sounder-firmware.install
Modified:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/control
   gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
Log:
wip, consolidate firmware packages into corresponding main package

Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-11-03 
18:22:33 UTC (rev 9916)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-11-03 
19:52:52 UTC (rev 9917)
@@ -396,52 +396,31 @@
 Description: GNU Radio FLEX Pager Decoder
  This package provides a decoder for the FLEX paging protocol for GNU Radio
 
-Package: gnuradio-sounder-firmware
-Section: comm
-Architecture: all
-Description: GNU Radio Channel Sounder Application
- This package provides an RF channel sounder application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which 
- require non-free tools to build.
-
 Package: gnuradio-sounder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
gnuradio-sounder-firmware
+Replaces: gnuradio-sounder-firmware
+Conflicts: gnuradio-sounder-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
 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: 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
+Replaces: gnuradio-gpio-firmware
+Conflicts: gnuradio-gpio-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: 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: comm
-Architecture: all
-Description: GNU Radio Monostatic Radar Firmware
- This package provides a monostatic radar application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which
- require non-free tools to build.
-
 Package: gnuradio-radar-mono
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
gnuradio-radar-mono-firmware
+Replaces: gnuradio-radar-mono-firmware
+Conflicts: gnuradio-radar-mono-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Monostatic Radar Application

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-11-03 18:22:33 UTC (rev 9916)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-11-03 19:52:52 UTC (rev 9917)
@@ -249,6 +249,8 @@
 $EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
 $EXTRACT gr-gpio/src/lib/Makefile ourlib_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
@@ -278,6 +280,8 @@
 touch $NAME
 $EXTRACT gr-radar-mono/src/python/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-radar-mono/src/python/Makefile 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
@@ -285,3 +289,5 @@
 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

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-gpio-firmware.install

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-radar-mono-firmware.install

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gnuradio-sounder-firmware.install