[Commit-gnuradio] r9897 - in gnuradio/branches/developers/jcorgan/deb-wip: debian gnuradio-examples/c++/dial_tone gr-audio-alsa/src

[jcorgan]

Author: jcorgan
Date: 2008-10-30 10:42:14 -0600 (Thu, 30 Oct 2008)
New Revision: 9897

Modified:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/control
   gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
   
gnuradio/branches/developers/jcorgan/deb-wip/gnuradio-examples/c++/dial_tone/Makefile.am
   gnuradio/branches/developers/jcorgan/deb-wip/gr-audio-alsa/src/Makefile.am
Log:
Rename libgr-audio-alsa to libgnuradio-audio-alsa, create packages

Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-10-30 
16:00:22 UTC (rev 9896)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-10-30 
16:42:14 UTC (rev 9897)
@@ -82,13 +82,6 @@
  .
  This package contains header files needed by developers.
 
-Package: libmblock0c2a
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GNU Radio Message Block Library
- This package provides the GNU Radio message block library.
-
 Package: libmblock0-dev
 Section: libdevel
 Architecture: any
@@ -126,6 +119,22 @@
  This package provides high level GUI construction classes based
  upon the wxPython bindings for wxWidgets.
 
+Package: libgnuradio-audio-alsa
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+
+Package: libgnuradio-audio-alsa-dev
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+ .
+ This package contains header files needed by developers.
+
 Package: python-gnuradio-audio-alsa
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
@@ -133,7 +142,7 @@
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio ALSA audio driver
- This package provides the Python interface to the GNU Radio ALSA
+ This package provides the Python wrappers around the GNU Radio ALSA
  audio driver.
 
 Package: python-gnuradio-audio-jack

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-10-30 16:00:22 UTC (rev 9896)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-10-30 16:42:14 UTC (rev 9897)
@@ -99,18 +99,27 @@
     sed -e 's/\.la$/.so/' >>$NAME
 $EXTRACT gr-atsc/src/python/Makefile ourdata_DATA >>$NAME
 
+# libgnuradio-audio-alsa
+NAME=debian/libgnuradio-audio-alsa.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so*/' >>$NAME
+
+# libgnuradio-audio-alsa-dev
+NAME=debian/libgnuradio-audio-alsa-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-audio-alsa.so >>$NAME
+
 # python-gnuradio-audio-alsa
 NAME=debian/python-gnuradio-audio-alsa.install
 rm -f $NAME
 touch $NAME
 echo etc/gnuradio/conf.d/gr-audio-alsa.conf >>$NAME
 $EXTRACT gr-audio-alsa/src/Makefile ourpython_PYTHON >>$NAME
-# Note: these will migrate to libgnuradio-audio-alsa in 3.2
-# 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
-#
 $EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES >>$NAME
 $EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so*/' >>$NAME

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/gnuradio-examples/c++/dial_tone/Makefile.am
    2008-10-30 16:00:22 UTC (rev 9896)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/gnuradio-examples/c++/dial_tone/Makefile.am
    2008-10-30 16:42:14 UTC (rev 9897)
@@ -26,7 +26,7 @@
          -I$(top_srcdir)/gr-audio-alsa/src \
         $(WITH_INCLUDES)
 
-GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgr-audio-alsa.la
+GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgnuradio-audio-alsa.la
 
 # For compiling outside the tree, these will get fished out by pkgconfig
 

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/gr-audio-alsa/src/Makefile.am  
2008-10-30 16:00:22 UTC (rev 9896)
+++ gnuradio/branches/developers/jcorgan/deb-wip/gr-audio-alsa/src/Makefile.am  
2008-10-30 16:42:14 UTC (rev 9897)
@@ -56,12 +56,12 @@
 
 ourlib_LTLIBRARIES = _audio_alsa.la
 
-lib_LTLIBRARIES = libgr-audio-alsa.la
+lib_LTLIBRARIES = libgnuradio-audio-alsa.la
 
 _audio_alsa_la_SOURCES =               \
        audio_alsa.cc
 
-libgr_audio_alsa_la_SOURCES =          \
+libgnuradio_audio_alsa_la_SOURCES =    \
        audio_alsa_sink.cc              \
        audio_alsa_source.cc            \
        gri_alsa.cc
@@ -80,15 +80,15 @@
        $(PYTHON_LDFLAGS)               \
        $(GNURADIO_CORE_LA)             \
        $(ALSA_LIBS)                    \
-       libgr-audio-alsa.la             \
+       libgnuradio-audio-alsa.la       \
        -lstdc++
 
-libgr_audio_alsa_la_LIBADD =           \
+libgnuradio_audio_alsa_la_LIBADD =     \
        $(ALSA_LIBS)
 
 _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
+libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
 
 _audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@