[Commit-gnuradio] r11021 - gnuradio/branches/developers/jcorgan/deb/debian

[jcorgan]

Author: jcorgan
Date: 2009-05-13 12:28:31 -0600 (Wed, 13 May 2009)
New Revision: 11021

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.postinst
   gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm
   gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postinst
   gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm
   gnuradio/branches/developers/jcorgan/deb/debian/rules
Log:
checkpoint

Modified: gnuradio/branches/developers/jcorgan/deb/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-13 
05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/control     2009-05-13 
18:28:31 UTC (rev 11021)
@@ -9,7 +9,7 @@
 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
 Standards-Version: 3.7.2
-XS-Python-Version: >= 2.5
+XS-Python-Version: = 2.6
 
 
################################################################################
 # C++ auxiliary libraries                                                      
#
@@ -18,7 +18,7 @@
 Package: libgruel
 Section: libs
 Architecture: any
-Depends: libboost-date-time1.37.0, libboost-thread1.37.0
+Depends: ${shlibs:Depends}
 Description: GNU Radio Utility Etcetera Library
  This package implements a variety of low-level utility
  routines for GNU Radio.
@@ -26,7 +26,7 @@
 Package: libgruel-dev
 Section: libdevel
 Architecture: any
-Depends: libgruel (= ${binary:Version}), libboost-date-time1.37-dev, 
libboost-thread1.37-dev
+Depends: libgruel (= ${binary:Version})
 Description: GNU Radio Utility Etcetera Library
  This package implements a variety of low-level utility
  routines for GNU Radio.
@@ -38,6 +38,7 @@
 Architecture: any
 Replaces: libgnuradio-omnithread0c2a
 Conflicts: libgnuradio-omnithread0c2a
+Depends: ${shlibs:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
@@ -59,7 +60,7 @@
 Architecture: any
 Replaces: libpmt0c2a
 Conflicts: libpmt0c2a
-Depends: libgnuradio-omnithread (= ${binary:Version})
+Depends: libgnuradio-omnithread (= ${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
@@ -87,7 +88,7 @@
 Architecture: any
 Replaces: libmblock0c2a
 Conflicts: libmblock0c2a
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version})
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio Message Block Library 
  This package provides the GNU Radio message block library. 
 
@@ -109,7 +110,7 @@
 Package: libusrp
 Section: comm
 Architecture: any
-Depends: libusb-0.1-4, libboost-thread1.37.0
+Depends: ${shlibs:Depends}
 Replaces: libusrp0, libusrp0c2a, usrp-firmware
 Suggests: usrp-doc
 Description: Client side library for the USRP(1) hardware
@@ -144,7 +145,7 @@
 Package: libusrp2
 Section: comm
 Architecture: any
-Depends: libboost-thread1.37.0, libgruel (= ${binary:Version}), 
libgnuradio-omnithread (= ${binary:Version})
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), ${shlibs:Depends}
 Suggests: usrp-doc
 Description: Client side library for the USRP2 hardware
  The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
@@ -181,7 +182,7 @@
 Package: libgnuradio-core
 Section: libs
 Architecture: any
-Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), libboost-thread1.37.0, libboost-date-time1.37.0, 
libfftw3-3, libgsl0ldbl
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (= 
${binary:Version}), ${shlibs:Depends}
 Conflicts:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
 Replaces:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
 Suggests: gnuradio-doc
@@ -202,7 +203,7 @@
 Package: libgnuradio-audio-alsa
 Section: libs
 Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libasound2
+Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio C++ block for ALSA sound system
  This package contains the ALSA sound system driver for GNU Radio.
 
@@ -218,7 +219,7 @@
 Package: libgnuradio-qtgui
 Section: libs
 Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libqt4-opengl, libqtcore4, 
libqtgui4, libqwt5-qt4, libqwtplot3d-qt4
+Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio C++ blocks fro QT-based GUI applications
  This package contains the C++ library for using GNU Radio inside
  QT-based GUI applications.
@@ -236,7 +237,7 @@
 Package: libgnuradio-usrp
 Section: libs
 Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libusrp (= ${binary:Version})
+Depends: libgnuradio-core (= ${binary:Version}), libusrp (= 
${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
@@ -254,7 +255,7 @@
 Package: libgnuradio-usrp2
 Section: libs
 Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= ${binary:Version})
+Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= 
${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
@@ -270,6 +271,35 @@
  This package contains header files needed by developers.
 
 
################################################################################
+# Python libraries for USRP                                                    
#
+################################################################################
+
+Package: python-usrp
+Architecture: any
+Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends}
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for the USRP library
+ This package provides auxiliary routines in Python for manipulating the USRP
+ hardware.
+
+################################################################################
+# Python libraries for GNU Radio                                               
#
+################################################################################
+
+Package: python-gnuradio-core
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
+Conflicts: python-gnuradio (< 3.2)
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for GNU Radio core library
+ This package provides the modules that enable one to use gnuradio 
+ from Python scripts.
+
+################################################################################
 # Documentation packages                                                       
#
 
################################################################################
 

Modified: gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh        
2009-05-13 18:28:31 UTC (rev 11021)
@@ -106,24 +106,55 @@
 $EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-usrp2.so >>$NAME
 
-exit 0
+# python-usrp
+NAME=debian/python-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_python_PYTHON >>$NAME
+$EXTRACT usrp/host/lib/legacy/Makefile usrppython_PYTHON >>$NAME
 
 # python-gnuradio-core
 NAME=debian/python-gnuradio-core.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/Makefile grpython_PYTHON >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrlib_LTLIBRARIES >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrlib_LTLIBRARIES | \
-    sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrpython_PYTHON >>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/gr/Makefile grgrpython_PYTHON 
>>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/blks2/Makefile grblks2python_PYTHON 
>>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/blks2impl/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
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_io_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_io_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_python_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_python_PYTHON >>$NAME
 
+exit 0
+
 # libusrp-inband-dev
 NAME=debian/libusrp-inband-dev.install
 rm -f $NAME
@@ -132,16 +163,6 @@
 echo usr/lib/libusrp-inband.so >>$NAME
 echo usr/lib/pkgconfig/usrp-inband.pc >>$NAME
 
-# python-usrp
-NAME=debian/python-usrp.install
-rm -f $NAME
-touch $NAME
-$EXTRACT usrp/host/swig/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT usrp/host/swig/Makefile ourlib_LTLIBRARIES | \
-    sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT usrp/host/lib/legacy/Makefile usrppython_PYTHON >>$NAME
-$EXTRACT usrp/host/swig/Makefile ourpython_PYTHON >>$NAME
-
 # python-gnuradio-usrp
 NAME=debian/python-gnuradio-usrp.install
 rm -f $NAME

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postinst
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postinst    
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postinst    
2009-05-13 18:28:31 UTC (rev 11021)
@@ -11,4 +11,5 @@
     addgroup --system usrp
 fi
 
+ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm      
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp.postrm      
2009-05-13 18:28:31 UTC (rev 11021)
@@ -7,5 +7,5 @@
 fi
 
 rm -f /etc/udev/rules.d/40-usrp.rules
-
+ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postinst
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postinst   
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postinst   
2009-05-13 18:28:31 UTC (rev 11021)
@@ -14,5 +14,5 @@
 # Create setuid root for group usrp on socket opener
 chown root.usrp /usr/bin/usrp2_socket_opener
 chmod 04750 /usr/bin/usrp2_socket_opener
-
+ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm     
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.postrm     
2009-05-13 18:28:31 UTC (rev 11021)
@@ -7,5 +7,5 @@
 fi
 
 rm -f /etc/security/limits.d/libusrp2.limits
-
+ldconfig
 exit 0

Modified: gnuradio/branches/developers/jcorgan/deb/debian/rules
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-13 
05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/jcorgan/deb/debian/rules       2009-05-13 
18:28:31 UTC (rev 11021)
@@ -106,9 +106,9 @@
        dh_strip
        dh_compress 
        dh_fixperms
-       #dh_makeshlibs
+       dh_makeshlibs
        dh_installdeb
-       #dh_shlibdeps
+       dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb --destdir=../debfiles