[Commit-gnuradio] r11059 - in gnuradio/branches/developers/jcorgan/deb: debian gnuradio-examples/python/digital gnuradio-examples/python/digital-bert gnuradio-examples/python/mp-sched

[jcorgan]

Author: jcorgan
Date: 2009-05-19 13:51:09 -0600 (Tue, 19 May 2009)
New Revision: 11059

Modified:
   gnuradio/branches/developers/jcorgan/deb/debian/control
   gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm
   gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm
   gnuradio/branches/developers/jcorgan/deb/debian/rules
   
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital-bert/Makefile.am
   
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/Makefile.am
   
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/mp-sched/Makefile.am
Log:
wip, closing in

Modified: gnuradio/branches/developers/jcorgan/deb/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-19 
07:02:44 UTC (rev 11058)
+++ gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-19 
19:51:09 UTC (rev 11059)
@@ -162,7 +162,7 @@
 Section: libdevel
 Architecture: any
 Depends: libusrp2 (= ${binary:Version}), libboost-thread1.37-dev, 
libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (= 
${binary:Version})
-Description: Client side library for the USRP(1) hardware
+Description: Client side library for the USRP2 hardware
  The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
  low-cost and open board. It features two high-speed analog-to-digital
  and digital-to-analog converters, an FPGA and a microcontroller. It's
@@ -302,6 +302,7 @@
 Package: python-gnuradio-wxgui
 Architecture: any
 Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), 
python-wxgtk2.8, python-opengl
+Conflicts: python-wxgtk2.6
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -319,6 +320,16 @@
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
 
+Package: python-gnuradio-usrp2
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+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
@@ -379,6 +390,16 @@
  This package provides an implementation of a full-rate GSM vocoder 
  for GNU Radio.
 
+Package: python-gnuradio-qtgui
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= 
${binary:Version}), python-gnuradio-core
+Section: python
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for GNU Radio ALSA audio driver
+ This package provides the Python wrappers around the GNU Radio QT
+ GUI C++ blocks.
+
 Package: python-gnuradio-trellis
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
@@ -389,17 +410,39 @@
  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
-#Provides: ${python:Provides}
-#Section: python
-#XB-Python-Version: ${python:Versions}
-#Description: GNU Radio SDL Interface Library
-# This package provides an interface to the SDL rendering library
-# for GNU Radio.
+Package: python-gnuradio-video-sdl
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio SDL Interface Library
+ This package provides an interface to the SDL rendering library
+ for GNU Radio.
 
 
################################################################################
+# GNU Radio Utilities, Examples, and Applications                              
#
+################################################################################
+
+Package: gnuradio-utils
+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}
+Description: GNU Radio Utilities
+ This package provides commonly used utilities for GNU Radio
+
+Package: gnuradio-examples
+Architecture: any
+Depends: ${python:Depends}, python-gnuradio-core
+Recommends: python-gnuradio-wxgui, python-gnuradio
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Example Programs
+ This package provides examples of GNU Radio usage using Python.
+
+################################################################################
 # Documentation packages                                                       
#
 
################################################################################
 
@@ -410,16 +453,54 @@
  This package contains the documentation for the GNU Radio software
  defined radio system.
 
+Package: usrp-doc
+Section: doc
+Architecture: all
+Description: Software Defined Radio
+ This package contains the documentation for the Universal Software Radio
+ Peripheral (USRP) hardware and interface library.
+
 
################################################################################
 # Meta-packages                                                                
#
 
################################################################################
 
-Package: gnuradio-dev
+Package: libgnuradio
+Section: libs
+Architecture: all
+Depends: libgnuradio-core (= ${binary:Version}), 
+Recommends: libgnuradio-audio-alsa, libgnuradio-qtqui, libgnuradio-usrp, 
libgnuradio-usrp2
+Description: GNU Radio C++ API libraries
+ This is a virtual package that depends, recommends, or suggests all of the
+ binary packages that make up the GNU Radio C++ API.  For development headers,
+ install libgnuradio-dev.
+
+Package: libgnuradio-dev
 Section: libdevel
 Architecture: all
-Recommends: gnuradio-doc, libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, 
libgnuradio-usrp-dev, libgnuradio-usrp2-dev
-Depends: libgnuradio-core-dev
+Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev
+Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev, 
libgnuradio-usrp-dev, libgnuradio-usrp2-dev,
+Suggests: gnuradio-doc, usrp-doc
+Replaces: gnuradio-dev
 Description: Development headers for GNU Radio C++ development
  This is a virtual package that depends or recommends the development header
- packages for the various GNU Radio components.  It is only needed if you 
intend
+ packages for the GNU Radio C++ API.  It is only needed if you intend
  to develop custom GNU Radio signal processing blocks in C++.
+
+Package: python-gnuradio
+Section: python
+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}
+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
+Section: comm
+Architecture: all
+Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, 
gnuradio-utils, gnuradio-examples
+Description: The GNU Software Radio Toolkit
+ This is a virtual package that installs the entire GNU Radio and USRP software
+ set.

Modified: gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-19 07:02:44 UTC (rev 11058)
+++ gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-19 19:51:09 UTC (rev 11059)
@@ -171,6 +171,15 @@
 $EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
+# python-gnuradio-usrp2
+NAME=debian/python-gnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_python_PYTHON >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
 # python-gnuradio-audio-alsa
 NAME=debian/python-gnuradio-audio-alsa.install
 rm -f $NAME
@@ -229,6 +238,16 @@
 $EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
+# python-gnuradio-qtgui
+NAME=debian/python-gnuradio-qtgui.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/python/Makefile qtguipython_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_python_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so*/' >>$NAME
+
 # python-gnuradio-trellis
 NAME=debian/python-gnuradio-trellis.install
 rm -f $NAME
@@ -241,16 +260,13 @@
 $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
 rm -f $NAME
 touch $NAME
-$EXTRACT gr-video-sdl/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_python_PYTHON >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # gnuradio-utils
@@ -264,20 +280,29 @@
 NAME=debian/gnuradio-examples.install
 rm -f $NAME
 touch $NAME
-$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile ourdata_DATA 
>>$NAME
-$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/audio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/digital/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/digital-bert/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/digital_voice/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/mp-sched/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/multi-antenna/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/multi_usrp/Makefile ourdata_DATA >>$NAME
-$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
-$EXTRACT gnuradio-examples/python/usrp2/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile 
dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/audio/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/digital_voice/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/multi-antenna/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/network/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_DATA >>$NAME
+$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
 rm -f $NAME

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm      
2009-05-19 07:02:44 UTC (rev 11058)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm      
2009-05-19 19:51:09 UTC (rev 11059)
@@ -6,6 +6,5 @@
        exit 0
 fi
 
-rm -f /etc/udev/rules.d/40-usrp.rules
-ldconfig
+/sbin/ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm     
2009-05-19 07:02:44 UTC (rev 11058)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm     
2009-05-19 19:51:09 UTC (rev 11059)
@@ -6,6 +6,5 @@
        exit 0
 fi
 
-rm -f /etc/security/limits.d/libusrp2.limits
-ldconfig
+/sbin/ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/rules
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-19 
07:02:44 UTC (rev 11058)
+++ gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-19 
19:51:09 UTC (rev 11059)
@@ -62,7 +62,7 @@
        touch $@
 
 install: install-stamp
-install-stamp: extract-stamp
+install-stamp: extract-stamp debian/control
        dh_testdir
        dh_testroot
        dh_clean -k

Modified: 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/Makefile.am
       2009-05-19 07:02:44 UTC (rev 11058)
+++ 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital/Makefile.am
       2009-05-19 19:51:09 UTC (rev 11059)
@@ -31,6 +31,7 @@
        benchmark_rx.py         \
        benchmark_tx.py         \
        gen_whitener.py         \
+       generic_usrp.py         \
        pick_bitrate.py         \
        receive_path.py         \
        receive_path_lb.py      \
@@ -39,4 +40,5 @@
        transmit_path.py        \
        transmit_path_lb.py     \
        tunnel.py               \
-       tx_voice.py
+       tx_voice.py             \
+       usrp_options.py

Modified: 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital-bert/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital-bert/Makefile.am
  2009-05-19 07:02:44 UTC (rev 11058)
+++ 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital-bert/Makefile.am
  2009-05-19 19:51:09 UTC (rev 11059)
@@ -23,6 +23,9 @@
 
 ourdatadir = $(exampledir)/digital-bert
 
+dist_ourdata_DATA = \
+       README
+
 dist_ourdata_SCRIPTS =         \
        benchmark_rx.py         \
        benchmark_tx.py         \

Modified: 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/mp-sched/Makefile.am
      2009-05-19 07:02:44 UTC (rev 11058)
+++ 
gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/mp-sched/Makefile.am
      2009-05-19 19:51:09 UTC (rev 11059)
@@ -22,6 +22,9 @@
 
 ourdatadir = $(exampledir)/mp-sched
 
+dist_ourdata_DATA = \
+       README
+
 dist_ourdata_SCRIPTS =         \
        plot_flops.py           \
        run_synthetic.py        \