[Commit-gnuradio] r6610 - in gnuradio/trunk: debian gr-audio-alsa/src mblock/src/lib omnithread pmt/src/lib

[jcorgan]

Author: jcorgan
Date: 2007-10-10 05:46:53 -0600 (Wed, 10 Oct 2007)
New Revision: 6610

Modified:
   gnuradio/trunk/debian/changelog
   gnuradio/trunk/debian/control
   gnuradio/trunk/debian/gen-install-files.sh
   gnuradio/trunk/debian/install-build-deps.sh
   gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install
   gnuradio/trunk/debian/libmblock0c2a.install
   gnuradio/trunk/debian/libpmt0c2a.install
   gnuradio/trunk/gr-audio-alsa/src/Makefile.am
   gnuradio/trunk/mblock/src/lib/Makefile.am
   gnuradio/trunk/omnithread/Makefile.am
   gnuradio/trunk/pmt/src/lib/Makefile.am
Log:
Tweaks to Debian packaging.

Added .so versioning where needed (libpmt, libmblock, libgromnithread) to allow 
automated dependency checking.

Reverted (perhaps temporarily) to '3.0.svn' version numbering as the '~' trick 
wasn't working with Ubuntu

Note: the -dev packages don't seem to be sufficient to compile the 
gr-howto-write-a-block module, so still debugging.



Modified: gnuradio/trunk/debian/changelog
===================================================================
--- gnuradio/trunk/debian/changelog     2007-10-10 09:55:40 UTC (rev 6609)
+++ gnuradio/trunk/debian/changelog     2007-10-10 11:46:53 UTC (rev 6610)
@@ -1,4 +1,4 @@
-gnuradio (3.0~svn) unstable; urgency=low
+gnuradio (3.0.svn) unstable; urgency=low
 
   * add/split packages to cover entire GNU Radio distribution
   * fix build failure with gcc-4.3 by adding a #include, closes: #420896

Modified: gnuradio/trunk/debian/control
===================================================================
--- gnuradio/trunk/debian/control       2007-10-10 09:55:40 UTC (rev 6609)
+++ gnuradio/trunk/debian/control       2007-10-10 11:46:53 UTC (rev 6610)
@@ -28,7 +28,7 @@
 Package: libpmt0c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a
+Depends: ${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
@@ -48,7 +48,7 @@
 Package: libmblock0c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a, libpmt0c2a
+Depends: ${shlibs:Depends}
 Description: GNU Radio Message Block Library
  This package provides the GNU Radio message block library.
 
@@ -64,7 +64,7 @@
 Package: libgnuradio-core0c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgnuradio-omnithread0c2a
+Depends: ${shlibs:Depends}
 Conflicts:  libgnuradio-core0, libgnuradio-core0c2
 Replaces:  libgnuradio-core0, libgnuradio-core0c2
 Suggests: gnuradio-doc
@@ -228,7 +228,7 @@
 Package: gnuradio
 Section: comm
 Architecture: all
-Depends: gnuradio-doc, python-gnuradio, gnuradio-examples
+Depends: gnuradio-doc, python-gnuradio, gnuradio-examples, gnuradio-utils
 Suggests: usrp
 Description: GNU Software Defined Radio
  This is a virtual package that depends the entire GNU Radio collection of
@@ -349,7 +349,7 @@
 Package: usrp
 Section: contrib/comm
 Architecture: all
-Depends: usrp-doc, usrp-firmware
+Depends: usrp-doc, usrp-firmware, libusrp0c2a
 Description: The Universal Software Radio Peripheral
  This is a virtual package that depends on the entire USRP software collection.
 

Modified: gnuradio/trunk/debian/gen-install-files.sh
===================================================================
--- gnuradio/trunk/debian/gen-install-files.sh  2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/debian/gen-install-files.sh  2007-10-10 11:46:53 UTC (rev 
6610)
@@ -106,11 +106,11 @@
 # They are only separate in this package for C++ only experimentation
 $EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME
 $EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES | \
-    sed -e 's/\.la$/.so/' >>$NAME
+    sed -e 's/\.la$/.so*/' >>$NAME
 #
 $EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES >>$NAME
 $EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES | \
-    sed -e 's/\.la$/.so/' >>$NAME
+    sed -e 's/\.la$/.so*/' >>$NAME
 
 # python-gnuradio-audio-jack
 NAME=debian/python-gnuradio-audio-jack.install

Modified: gnuradio/trunk/debian/install-build-deps.sh
===================================================================
--- gnuradio/trunk/debian/install-build-deps.sh 2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/debian/install-build-deps.sh 2007-10-10 11:46:53 UTC (rev 
6610)
@@ -9,7 +9,7 @@
 fi
 
 sudo apt-get install \
-    autotools-dev doxygen $FFTW3DEV libasound2-dev \
+    build-essential autotools-dev doxygen $FFTW3DEV libasound2-dev \
     libboost-dev libcppunit-dev libjack0.100.0-dev libsdl1.2-dev \
     portaudio19-dev libtool libusb-dev pkg-config python python-all-dev \
     python-central python-numpy python-wxgtk2.6 sdcc swig xmlto

Modified: gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install    2007-10-10 
09:55:40 UTC (rev 6609)
+++ gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install    2007-10-10 
11:46:53 UTC (rev 6610)
@@ -1,3 +1,3 @@
 usr/lib/libgromnithread.la
-usr/lib/libgromnithread.so
+usr/lib/libgromnithread*.so*
 usr/lib/pkgconfig/gnuradio-omnithread.pc

Modified: gnuradio/trunk/debian/libmblock0c2a.install
===================================================================
--- gnuradio/trunk/debian/libmblock0c2a.install 2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/debian/libmblock0c2a.install 2007-10-10 11:46:53 UTC (rev 
6610)
@@ -1,4 +1,4 @@
 usr/lib/pkgconfig/mblock.pc
 usr/lib/libmblock.la
-usr/lib/libmblock.so
+usr/lib/libmblock*.so*
 

Modified: gnuradio/trunk/debian/libpmt0c2a.install
===================================================================
--- gnuradio/trunk/debian/libpmt0c2a.install    2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/debian/libpmt0c2a.install    2007-10-10 11:46:53 UTC (rev 
6610)
@@ -1,4 +1,3 @@
 usr/lib/libpmt.la
-usr/lib/libpmt.so
+usr/lib/libpmt*.so*
 usr/lib/pkgconfig/pmt.pc
-usr/share/gnuradio/pmt*

Modified: gnuradio/trunk/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/Makefile.am        2007-10-10 09:55:40 UTC 
(rev 6609)
+++ gnuradio/trunk/gr-audio-alsa/src/Makefile.am        2007-10-10 11:46:53 UTC 
(rev 6610)
@@ -88,7 +88,7 @@
 
 _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
 
 audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc 
$(LOCAL_IFILES)

Modified: gnuradio/trunk/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/mblock/src/lib/Makefile.am   2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/mblock/src/lib/Makefile.am   2007-10-10 11:46:53 UTC (rev 
6610)
@@ -66,7 +66,7 @@
 
 
 # magic flags
-libmblock_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+libmblock_la_LDFLAGS = $(NO_UNDEFINED)
 
 # link the library against the c++ standard library
 libmblock_la_LIBADD =                  \

Modified: gnuradio/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am       2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/omnithread/Makefile.am       2007-10-10 11:46:53 UTC (rev 
6610)
@@ -44,7 +44,7 @@
        nt.cc
 endif
 
-libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version 
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) 
 
 libgromnithread_la_LIBADD =            \
        $(PTHREAD_LIBS)

Modified: gnuradio/trunk/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/pmt/src/lib/Makefile.am      2007-10-10 09:55:40 UTC (rev 
6609)
+++ gnuradio/trunk/pmt/src/lib/Makefile.am      2007-10-10 11:46:53 UTC (rev 
6610)
@@ -67,7 +67,7 @@
        pmt_unv.cc                      
 
 # magic flags
-libpmt_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+libpmt_la_LDFLAGS = $(NO_UNDEFINED)
 
 # link the library against the c++ standard library
 libpmt_la_LIBADD =                     \
@@ -94,7 +94,7 @@
        qa_pmt_unv.cc                   
 
 # magic flags
-libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid version
 
 libpmt_qa_la_LIBADD =                  \
        libpmt.la                       \