[Commit-gnuradio] r11049 - in gnuradio/branches/developers/jcorgan/deb: debian dtools/bin

[jcorgan]

Author: jcorgan
Date: 2009-05-18 19:42:20 -0600 (Mon, 18 May 2009)
New Revision: 11049

Modified:
   gnuradio/branches/developers/jcorgan/deb/debian/control
   gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/deb/debian/rules
   gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames
Log:
checkpoint

Modified: gnuradio/branches/developers/jcorgan/deb/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-18 
18:58:32 UTC (rev 11048)
+++ gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-19 
01:42:20 UTC (rev 11049)
@@ -309,6 +309,16 @@
  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-audio-alsa
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= 
${binary:Version}), python-gnuradio-core
@@ -349,45 +359,36 @@
  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-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-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-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

Modified: gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-18 18:58:32 UTC (rev 11048)
+++ gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-19 01:42:20 UTC (rev 11049)
@@ -162,6 +162,15 @@
 $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-audio-alsa
 NAME=debian/python-gnuradio-audio-alsa.install
 rm -f $NAME
@@ -201,59 +210,39 @@
 $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-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
 
+exit 0
+
 # python-gnuradio-video-sdl
 # TODO: break out libgnuradio-video-sdl
 NAME=debian/python-gnuradio-video-sdl.install

Modified: gnuradio/branches/developers/jcorgan/deb/debian/rules
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-18 
18:58:32 UTC (rev 11048)
+++ gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-19 
01:42:20 UTC (rev 11049)
@@ -34,31 +34,35 @@
 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
        dh_testdir
        dh_testroot
        dh_clean -k

Modified: 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames   
    2009-05-18 18:58:32 UTC (rev 11048)
+++ 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames   
    2009-05-19 01:42:20 UTC (rev 11049)
@@ -54,7 +54,11 @@
     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)