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

[jcorgan]

Author: jcorgan
Date: 2009-05-20 15:57:40 -0600 (Wed, 20 May 2009)
New Revision: 11077

Modified:
   gnuradio/branches/developers/jcorgan/deb/debian/control
   gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/deb/debian/pyversions
   gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames
Log:
Adds grc package, tweaks

Modified: gnuradio/branches/developers/jcorgan/deb/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-20 
19:08:35 UTC (rev 11076)
+++ gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-20 
21:57:40 UTC (rev 11077)
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Johnathan Corgan <address@hidden>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, 
pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, 
libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, 
python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, 
portaudio19-dev, libsdl1.2-dev, python-cheetah, python-gtk2, python-lxml
+Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, 
pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, 
libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, 
python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, 
portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2
 Standards-Version: 3.7.2
 XS-Python-Version: = 2.6
 
@@ -88,7 +88,7 @@
 Architecture: any
 Replaces: libmblock0c2a
 Conflicts: libmblock0c2a
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), ${shlibs:Depends}
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), ${shlibs:Depends}, guile-1.8
 Description: GNU Radio Message Block Library 
  This package provides the GNU Radio message block library. 
 
@@ -280,7 +280,7 @@
 Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends}
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for the USRP library
  This package provides auxiliary routines in Python for manipulating the USRP
  hardware.
@@ -295,18 +295,18 @@
 Conflicts: python-gnuradio (< 3.2)
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio core library
  This package provides the modules that enable one to use gnuradio 
  from Python scripts.
 
 Package: python-gnuradio-wxgui
 Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), 
python-wxgtk2.8, python-opengl
+Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}), 
python-wxgtk2.8, python-opengl, python-numpy
 Conflicts: python-wxgtk2.6
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Graphical Interface Routines based on wxPython
  This package provides high level GUI construction classes based
  upon the wxPython bindings for wxWidgets.
@@ -316,7 +316,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, 
python-usrp
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -326,7 +326,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
  driver and daughterboard drivers.
@@ -336,7 +336,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= 
${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio ALSA
  audio driver.
@@ -346,7 +346,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}, python-gnuradio-audio
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python PortAudio Driver
  This package provides the Python interface to the GNU Radio driver
  for the PortAudio audio system.
@@ -356,7 +356,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python JACK Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the JACK audio system.
@@ -366,7 +366,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Python OSS Audio Driver
  This package provides the Python interface to the GNU Radio driver
  for the OSS audio system.
@@ -376,7 +376,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio CVSD Vocoder
  This package provides an implementation of a CVSD vocoder for
  GNU Radio.
@@ -386,7 +386,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio GSM Full-Rate Vocoder
  This package provides an implementation of a full-rate GSM vocoder 
  for GNU Radio.
@@ -396,7 +396,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= 
${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: Python bindings for GNU Radio ALSA audio driver
  This package provides the Python wrappers around the GNU Radio QT
  GUI C++ blocks.
@@ -406,7 +406,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Trellis-Coded Modulation library
  This package provides an implementation of trellis-coded modulation
  for GNU Radio.
@@ -416,7 +416,7 @@
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
 Provides: ${python:Provides}
 Section: python
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio SDL Interface Library
  This package provides an interface to the SDL rendering library
  for GNU Radio.
@@ -430,7 +430,7 @@
 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}
+XB-Python-Version: 2.6
 Description: GNU Radio Utilities
  This package provides commonly used utilities for GNU Radio
 
@@ -439,7 +439,7 @@
 Depends: ${python:Depends}, python-gnuradio-core
 Recommends: python-gnuradio-wxgui, python-gnuradio
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Example Programs
  This package provides examples of GNU Radio usage using Python.
 
@@ -447,7 +447,7 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio FLEX Pager Decoder
  This package provides a decoder for the FLEX paging protocol for GNU Radio
 
@@ -457,7 +457,7 @@
 Conflicts: gnuradio-sounder-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
 
@@ -467,7 +467,7 @@
 Conflicts: gnuradio-gpio-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Streaming Digital Application
  This package provides streaming digital GPIO capabilities for GNU Radio
 
@@ -477,7 +477,7 @@
 Conflicts: gnuradio-radar-mono-firmware
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Monostatic Radar Application
  This package provides a monostatic radar application for GNU Radio
 
@@ -485,10 +485,18 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
python-gnuradio-wxgui
 Section: comm
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: 2.6
 Description: GNU Radio Radio Astronomy Applications
  This package provides radio astronomy applications for GNU Radio
 
+Package: grc
+Architecture: any
+Depends: python (>= 2.6), python-gnuradio
+Section: comm
+XB-Python-Version: 2.6
+Description: The GNU Radio Companion
+ GRC is a graphical flowgraph editor for the GNU Software Radio
+
 
################################################################################
 # Documentation packages                                                       
#
 
################################################################################
@@ -539,7 +547,7 @@
 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}
+XB-Python-Version: 2.6
 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.

Modified: gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-20 19:08:35 UTC (rev 11076)
+++ gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-20 21:57:40 UTC (rev 11077)
@@ -349,3 +349,32 @@
 $EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES >>$NAME
 $EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES |
     sed -e 's/\.la$/.so/' >>$NAME
+
+# grc
+NAME=debian/grc.install
+rm -f $NAME
+touch $NAME
+$EXTRACT grc/data/platforms/base/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/blocks/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_audiodata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_simpledata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_trellisdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_usrpdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_xmlrpcdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/scripts/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/src/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/blks2/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/usrp/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile oursubpython_PYTHON >>$NAME
+$EXTRACT grc/src/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/base/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/utils/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/utils/Makefile ourpython_PYTHON >>$NAME

Modified: gnuradio/branches/developers/jcorgan/deb/debian/pyversions
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/pyversions  2009-05-20 
19:08:35 UTC (rev 11076)
+++ gnuradio/branches/developers/jcorgan/deb/debian/pyversions  2009-05-20 
21:57:40 UTC (rev 11077)
@@ -1 +1 @@
-2.5
+2.6
\ No newline at end of file

Modified: 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames   
    2009-05-20 19:08:35 UTC (rev 11076)
+++ 
gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames   
    2009-05-20 21:57:40 UTC (rev 11077)
@@ -84,12 +84,12 @@
     target_files = make.readline().rstrip()
     if target_dirname.startswith('/'):
         target_dirname = target_dirname[1:]
-    
+   
     #print "target_dirname =", target_dirname
     #print "target_files =", target_files
 
     for f in target_files.split():
-        sys.stdout.write(os.path.join(target_dirname, f) + '\n')
+        sys.stdout.write(os.path.join(target_dirname, f.split('/')[-1]) + '\n')
 
 if __name__ == '__main__':
   main()