[Commit-gnuradio] r6297 - in gnuradio/branches/features/deb: config debian gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/vocoder gr-cvsd-vocoder/src/lib gr-gsm-fr-vocoder/src/lib

[jcorgan]

Author: jcorgan
Date: 2007-09-04 14:55:03 -0600 (Tue, 04 Sep 2007)
New Revision: 6297

Added:
   gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/
   
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am
   
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
Removed:
   gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/__init__.py
   gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/__init__.py
Modified:
   gnuradio/branches/features/deb/config/grc_gnuradio_core.m4
   gnuradio/branches/features/deb/debian/
   gnuradio/branches/features/deb/debian/build-all.sh
   gnuradio/branches/features/deb/debian/control
   gnuradio/branches/features/deb/debian/gen-install-files.sh
   gnuradio/branches/features/deb/debian/rules
   gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/Makefile.am
   gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/Makefile.am
   gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/Makefile.am
Log:
Work in progress.

Modified: gnuradio/branches/features/deb/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/features/deb/config/grc_gnuradio_core.m4  2007-09-04 
19:47:03 UTC (rev 6296)
+++ gnuradio/branches/features/deb/config/grc_gnuradio_core.m4  2007-09-04 
20:55:03 UTC (rev 6297)
@@ -51,6 +51,7 @@
         gnuradio-core/src/python/gnuradio/gr/run_tests \
         gnuradio-core/src/python/gnuradio/gru/Makefile \
         gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
+       gnuradio-core/src/python/gnuradio/vocoder/Makefile \
         gnuradio-core/src/tests/Makefile \
         gnuradio-core/src/utils/Makefile \
     ])


Property changes on: gnuradio/branches/features/deb/debian
___________________________________________________________________
Name: svn:ignore
   - libmblock0-dev.install
libgnuradio-core0-dev.install
libusrp0-dev.install
libusrp-inband0-dev.install
python-gnuradio-core.install
python-gnuradio-audio-alsa.install
python-gnuradio-usrp.install
python-gnuradio-wxgui.install
python-gnuradio-atsc.install
python-gnuradio-gsm-fr-vocoder.install
python-gnuradio-comedi.install
python-gnuradio-audio-oss.install
python-gnuradio-audio-portaudio.install
python-gnuradio-audio-jack.install
python-gnuradio-trellis.install
python-gnuradio-video-sdl.install
python-gnuradio-cvsd-vocoder.install
python-usrp.install
python-gnuradio-utils.install
gnuradio-examples.install
gnuradio-radio-astronomy.install
gnuradio-pager.install
gnuradio-radar-mono.install

   + libmblock0-dev.install
libgnuradio-core0-dev.install
libusrp0-dev.install
libusrp-inband0-dev.install
python-gnuradio-core.install
python-gnuradio-audio-alsa.install
python-gnuradio-usrp.install
python-gnuradio-wxgui.install
python-gnuradio-atsc.install
python-gnuradio-gsm-fr-vocoder.install
python-gnuradio-comedi.install
python-gnuradio-audio-oss.install
python-gnuradio-audio-portaudio.install
python-gnuradio-audio-jack.install
python-gnuradio-trellis.install
python-gnuradio-video-sdl.install
python-gnuradio-cvsd-vocoder.install
python-usrp.install
python-gnuradio-utils.install
gnuradio-examples.install
gnuradio-radio-astronomy.install
gnuradio-pager.install
gnuradio-radar-mono.install
gnuradio-sounder.install


Modified: gnuradio/branches/features/deb/debian/build-all.sh
===================================================================
--- gnuradio/branches/features/deb/debian/build-all.sh  2007-09-04 19:47:03 UTC 
(rev 6296)
+++ gnuradio/branches/features/deb/debian/build-all.sh  2007-09-04 20:55:03 UTC 
(rev 6297)
@@ -7,4 +7,6 @@
     -us \
     -rfakeroot
 
+cd ../build-area
+dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 

Modified: gnuradio/branches/features/deb/debian/control
===================================================================
--- gnuradio/branches/features/deb/debian/control       2007-09-04 19:47:03 UTC 
(rev 6296)
+++ gnuradio/branches/features/deb/debian/control       2007-09-04 20:55:03 UTC 
(rev 6297)
@@ -90,8 +90,6 @@
 Package: python-gnuradio-core
 Architecture: any
 Depends: ${python:Depends}, libgnuradio-core0c2a, python-numpy
-Conflicts: python-gnuradio 
-Replaces: python-gnuradio
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -116,6 +114,7 @@
 Conflicts: libusrp0
 Replaces: libusrp0
 Suggests: usrp-doc
+Recommends: usrp-firmware
 Description: Client side library for the USRP
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
  low-cost and open board. It features four high-speed analog-to-digital
@@ -349,7 +348,7 @@
 Package: gnuradio-sounder
 Architecture: any
 Depends: ${python:Depends}, python-gnuradio-core, python-gnuradio-usrp
-Recommends: gnuradio-sounder
+Recommends: gnuradio-sounder-firmware
 Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Channel Sounder Application
@@ -363,3 +362,37 @@
  .
  This package contains the FPGA bitstrings for the USRP, which require
  non-free tools to build.
+
+Package: python-gnuradio
+Section: python
+Architecture: all
+Depends: python-gnuradio-atsc, python-gnuradio-audio-alsa, 
python-gnuradio-audio-jack, python-gnuradio-audio-oss, 
python-gnuradio-audio-portaudio, python-gnuradio-comedi, python-gnuradio-core, 
python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, 
python-gnuradio-trellis, python-gnuradio-usrp, python-gnuradio-utils, 
python-gnuradio-video-sdl, python-gnuradio-wxgui
+Description: Python Libraries for GNU Radio Components
+ This is a virtual package that depends upon all the Python components 
+ for GNU Radio.
+
+Package: gnuradio
+Section: comm
+Architecture: all
+Depends: gnuradio-doc, gnuradio-examples, python-gnuradio, gnuradio-pager, 
gnuradio-radar-mono, gnuradio-radio-astronomy, gnuradio-sounder
+Suggests: usrp
+Descripton: GNU Software Defined Radio
+ This is a virtual package that depends the entire GNU Radio collection of
+ components.  If you are using a USRP, you should also install the usrp 
package.
+
+Package: gnuradio-dev
+Section: libdevel
+Architecture: all
+Depends: libgnuradio-core0-dev, libgnuradio-omnithread0-dev, libmblock0-dev, 
libpmt0-dev
+Description: Development headers for GNU Radio C++ development
+ This is a virtual package that depends on all the development header packages
+ for the various GNU Radio components.  It is only needed if you intend to 
develop
+ custom GNU Radio signal processing blocks in C++.
+
+Package: usrp
+Section: comm
+Architecture: all
+Depends: libusrp0c2a, python-usrp, usrp-doc
+Description: The Univeral Software Radio Peripheral
+ This is a virtual package that depends on the entire USRP software 
collection. You will
+ still need to install package usrp-firmware, in contrib/comm, however.

Modified: gnuradio/branches/features/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/features/deb/debian/gen-install-files.sh  2007-09-04 
19:47:03 UTC (rev 6296)
+++ gnuradio/branches/features/deb/debian/gen-install-files.sh  2007-09-04 
20:55:03 UTC (rev 6297)
@@ -44,6 +44,7 @@
 $EXTRACT gnuradio-core/src/python/gnuradio/blksimpl2/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
+$EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile 
grvocoderpython_PYTHON >>$NAME
 
 # libusrp0-dev
 NAME=debian/libusrp0-dev.install

Modified: gnuradio/branches/features/deb/debian/rules
===================================================================
--- gnuradio/branches/features/deb/debian/rules 2007-09-04 19:47:03 UTC (rev 
6296)
+++ gnuradio/branches/features/deb/debian/rules 2007-09-04 20:55:03 UTC (rev 
6297)
@@ -62,7 +62,7 @@
        touch configure-stamp
 
 extract: extract-stamp
-extract-stamp: configure-stamp
+extract-stamp: configure-stamp debian/gen-install-files.sh
        dh_testdir
        debian/gen-install-files.sh 
        touch $@

Modified: 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/Makefile.am
===================================================================
--- 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/Makefile.am    
    2007-09-04 19:47:03 UTC (rev 6296)
+++ 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/Makefile.am    
    2007-09-04 20:55:03 UTC (rev 6297)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = gr gru gruimpl blks blksimpl blks2 blksimpl2
+SUBDIRS = gr gru gruimpl blks blksimpl blks2 blksimpl2 vocoder
 
 grpython_PYTHON =                      \
        __init__.py                     \


Property changes on: 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am
===================================================================
--- 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am
                                (rev 0)
+++ 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am
        2007-09-04 20:55:03 UTC (rev 6297)
@@ -0,0 +1,26 @@
+#
+# Copyright 2004,2007 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+grvocoderpythondir = $(grpythondir)/vocoder
+grvocoderpython_PYTHON = \
+       __init__.py

Added: 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
===================================================================
--- 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
                                (rev 0)
+++ 
gnuradio/branches/features/deb/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
        2007-09-04 20:55:03 UTC (rev 6297)
@@ -0,0 +1 @@
+# make this a package

Modified: gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/Makefile.am  
2007-09-04 19:47:03 UTC (rev 6296)
+++ gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/Makefile.am  
2007-09-04 20:55:03 UTC (rev 6297)
@@ -54,7 +54,6 @@
 
 # This gets cvsd_vocoder.py installed in the right place
 ourpython_PYTHON =                     \
-       __init__.py                     \
        cvsd_vocoder.py
 
 ourlib_LTLIBRARIES = _cvsd_vocoder.la

Deleted: gnuradio/branches/features/deb/gr-cvsd-vocoder/src/lib/__init__.py

Modified: gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/Makefile.am        
2007-09-04 19:47:03 UTC (rev 6296)
+++ gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/Makefile.am        
2007-09-04 20:55:03 UTC (rev 6297)
@@ -56,7 +56,6 @@
 
 # This gets gsm_full_rate.py installed in the right place
 ourpython_PYTHON =                     \
-       __init__.py                     \
        gsm_full_rate.py
 
 ourlib_LTLIBRARIES = _gsm_full_rate.la

Deleted: gnuradio/branches/features/deb/gr-gsm-fr-vocoder/src/lib/__init__.py