Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu packaging...

Several new trunk components still need debs created.

Impact on non-packaging code:

* Renamed libgr_audio_alsa.so to libgnuradio-audio-alsa.so

* Renamed libusrp_inband.so to libusrp-inband.so

* Added PYTHON_CHECK_MODULE to build system to simplify Python dependency verification

Packaging code updates:

* Updated build-depends and package dependencies to be current with trunk

* Added package for libgruel and libgruel-dev

* Renamed library packages to use simplified names, removing the 0 or 0c2a suffix. This may not follow Debian policy, but we can revisit this if we ever go into official Debian or Ubuntu.

* Remove gr-comedi from packaging

* Restructured sections to eliminate 'contrib'.  Since we're not official Debian, we don't need to deal with the sdcc-nf issue.

* Consolidated usrp firmware packages into corresponding main packages (same as previous).

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9918 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/gr_python.m4 b/config/gr_python.m4
index 6c862bba397b2516ef92f92c5f8a403ab8a7d2c7..ea6df49c44c3be821118d91aad7dd23e70a3a394 100644 (file)
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -126,3 +126,29 @@ print path
            AC_SUBST(PYTHON_LDFLAGS)
        fi
 ])
+
+# PYTHON_CHECK_MODULE
+#
+# Determines if a particular Python module can be imported
+#
+# $1 - module name
+# $2 - module description
+# $3 - action if found
+# $4 - action if not found
+
+AC_DEFUN([PYTHON_CHECK_MODULE],[
+    AC_MSG_CHECKING([for $2]) 
+    python_cmd='import sys
+try:
+    import $1
+except:
+    sys.exit(1)'
+
+    if ! $PYTHON -c "$python_cmd" ; then
+       AC_MSG_RESULT([no])
+       $4
+    else
+       AC_MSG_RESULT([yes])
+       $3
+    fi
+])

diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index f5d6eb32e2c15d181f5d0570bcf80f2015f6a91b..9c653c1c255da8b8b302ea841efb826ceb18eaad 100644 (file)
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[
 
     AC_CONFIG_FILES([ \
         gr-audio-alsa/Makefile \
+       gr-audio-alsa/gr-audio-alsa.pc \
         gr-audio-alsa/src/Makefile \
         gr-audio-alsa/src/run_tests \
     ])

diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 531cafd2a4dcf6357589cf192781e067a552d638..2bdfacbc05542a1a0aa1692a9e0b3fd7aec84548 100644 (file)
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[
     dnl   no   : otherwise
     if test $passed = yes; then
         dnl Don't do gr-comedi if the 'comedi' library is unavailable.
-        PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],
+        PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[],
             [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
     fi
 

diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index 476c431d2ca41987b6d6a90ccef9b481e41d1e00..30c9b438b13d1105dcfbf8a2b828643a0fdab9f5 100644 (file)
--- a/config/grc_gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -29,14 +29,8 @@ AC_DEFUN([GRC_GR_WXGUI],[
     dnl   yes  : if the --enable code passed muster and all dependencies are met
     dnl   no   : otherwise
     if test $passed = yes; then
-        if ! ${PYTHON} -c 'import wx'; then
-            AC_MSG_RESULT([gr-wxgui requires wxPython, not found.])
-            passed=no
-        fi
-        if ! ${PYTHON} -c 'import numpy'; then
-            AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), not found.])
-            passed=no
-        fi
+       PYTHON_CHECK_MODULE([wx],[Python wxWidgets wrappers],[],[passed=no])
+       PYTHON_CHECK_MODULE([numpy],[Numeric Python extensions],[],[passed=no])
     fi
 
     AC_CONFIG_FILES([ \

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index b5ae52cee023c0cfec13a43fe7b979f63213ce11..8dfbe239966e636eeb96131145ed727027cf8b07 100644 (file)
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -29,18 +29,9 @@ AC_DEFUN([GRC_GRC],[
     dnl # test python dependencies
     dnl ########################################
     if test $passed = yes; then
-        if ! ${PYTHON} -c 'import Cheetah'; then
-            AC_MSG_RESULT([grc requires the Python Cheetah templates installed, not found.])
-            passed=no
-        fi
-        if ! ${PYTHON} -c 'import pygtk'; then
-            AC_MSG_RESULT([grc requires Python GTK wrappers installed, not found.])
-            passed=no
-        fi
-        if ! ${PYTHON} -c 'import lxml'; then
-            AC_MSG_RESULT([grc requires libxml2 and libxslt wrappers (lxml), not found.])
-            passed=no
-        fi
+       PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates],[],[passed=no])
+       PYTHON_CHECK_MODULE([pygtk],[Python GTK wrappers],[],[passed=no])
+       PYTHON_CHECK_MODULE([lxml],[Python XML wrappers],[],[passed=no])
     fi
 
     dnl ########################################

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index f810748ab6617c8dbad7a6a2ca21011754999c3b..6783e99a99b177344318ee56eb9e11640010a63e 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -61,7 +61,7 @@ AC_DEFUN([GRC_USRP],[
                -I\${abs_top_srcdir}/usrp/firmware/include"
         usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
        usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
-       usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la"
+       usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la"
     fi
 
     dnl Include the usrp-inband INCLUDES and LA

diff --git a/debian/changelog b/debian/changelog
index b9e7a58eb1e373d04933520fe425f2725bc1ae10..4040cfc4104091f08aec5b34378050a79381b069 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gnuradio (3.1.svn-7817) unstable; urgency=low
+gnuradio (3.1.svn) unstable; urgency=low
 
   * post release 3.1 trunk repository packages
   * see http://gnuradio.org/trac/wiki for stable branch

diff --git a/debian/control b/debian/control
index f8bc0fddef4699735f399b2ce132523b0c86c6e8..15414c77bfeadf01a3a4f18a9dd7dfa5a36e2e7a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,83 +3,115 @@ Section: comm
 Priority: optional
 Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
 Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev | libfftw3-dev, 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 (>= 0.5), python-numpy, python-wxgtk2.8, sdcc, swig, xmlto
+Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.35-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.3
+XS-Python-Version: >= 2.5
 
-Package: libgnuradio-omnithread0c2a
+Package: libgruel
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Description: GNU Radio Utility Etcetera Library
+ This package implements a variety of low-level utility
+ routines for GNU Radio.
+
+Package: libgruel-dev
+Section: libdevel
+Architecture: any
+Depends: libgruel (= ${binary:Version}), libboost1.35-dev
+Description: GNU Radio Utility Etcetera Library
+ This package implements a variety of low-level utility
+ routines for GNU Radio.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-omnithread
+Section: libs
+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.
 
-Package: libgnuradio-omnithread0-dev
+Package: libgnuradio-omnithread-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-omnithread0c2a (= ${binary:Version})
+Replaces: libgnuradio-omnithread0-dev
+Conflicts: libgnuradio-omnithread0-dev
+Depends: libgnuradio-omnithread (= ${binary:Version})
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
  .
  This package contains header files needed by developers.
 
-Package: libpmt0c2a
+Package: libgnuradio-core
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
+Replaces:  libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
+Suggests: gnuradio-doc
+Description: The GNU Sofware Radio Core Library
+ This package contains the core GNU Radio libraries.
+
+Package: libgnuradio-core-dev
+Section: libdevel
+Architecture: any 
+Replaces: libgnuradio-core0-dev
+Conflicts: libgnuradio-core0-dev
+Depends: libgnuradio-core (= ${binary:Version}), libgnuradio-omnithread-dev, libboost1.35-dev, libgruel-dev, libgsl0-dev, fftw3-dev | libfftw3-dev
+Description: The GNU Software Radio Core Library
+ This package contains the core GNU Radio libraries.
+ .
+ This package contains header files needed by developers.
+
+Package: libpmt
 Section: libs
 Architecture: any
+Replaces: libpmt0c2a
+Conflicts: libpmt0c2a
 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
  reference counting using the boost shared_ptr templates.
 
-Package: libpmt0-dev
+Package: libpmt-dev
 Section: libdevel
 Architecture: any
-Depends: libpmt0c2a (= ${binary:Version}), libgnuradio-omnithread0-dev, libboost-dev
+Replaces: libpmt0-dev
+Conflicts: libpmt0-dev
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev, libboost1.35-dev
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
- to lisp or python data objects, and implement transparent
+ to lisp or Python data objects, and implement transparent
  reference counting using the boost shared_ptr templates.
  .
  This package contains header files needed by developers.
 
-Package: libmblock0c2a
-Section: libs
+Package: libmblock 
+Section: libs 
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: GNU Radio Message Block Library
- This package provides the GNU Radio message block library.
+Replaces: libmblock0c2a
+Conflicts: libmblock0c2a
+Depends: ${shlibs:Depends} 
+Description: GNU Radio Message Block Library 
+ This package provides the GNU Radio message block library. 
 
-Package: libmblock0-dev
+Package: libmblock-dev
 Section: libdevel
 Architecture: any
-Depends: libmblock0c2a (= ${binary:Version}), libgnuradio-omnithread0-dev, libpmt0-dev
+Replaces: libmblock0-dev
+Conflicts: libmblock0-dev
+Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev, libpmt-dev
 Description: GNU Radio Message Block Library
  This package provides the GNU Radio message block library.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-core0c2a
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts:  libgnuradio-core0, libgnuradio-core0c2
-Replaces:  libgnuradio-core0, libgnuradio-core0c2
-Suggests: gnuradio-doc
-Description: GNU Radio Core Library
- This package contains the core GNU Radio libraries.
-
-Package: libgnuradio-core0-dev
-Section: libdevel
-Architecture: any
-Depends: libgnuradio-core0c2a (= ${binary:Version}), libgnuradio-omnithread0-dev, libboost-dev, fftw3-dev | libfftw3-dev
-Description: Software Defined Radio
- This package contains the core GNU Radio libraries.
- .
- This package contains header files needed by developers.
-
 Package: gnuradio-doc
 Section: doc
 Architecture: all
@@ -100,7 +132,7 @@ Description: Python bindings for GNU Radio core library
 
 Package: python-gnuradio-wxgui
 Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core, python-wxgtk2.6
+Depends: ${python:Depends}, python-gnuradio-core, python-wxgtk2.8, python-opengl
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -108,6 +140,22 @@ Description: GNU Radio Graphical Interface Routines based on wxPython
  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: libdevel
+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
@@ -115,7 +163,7 @@ Section: python
 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
@@ -157,15 +205,15 @@ XB-Python-Version: ${python:Versions}
 Description: GNU Radio ATSC Receiver
  This package provides a decoder for ATSC waveforms using GNU Radio.
 
-Package: python-gnuradio-comedi
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python Comedilib Driver
- This package provides the Python interface to the GNU Radio driver
- for the comedilib data acquisition hardware library.
+#Package: python-gnuradio-comedi
+#Architecture: any
+#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+#Provides: ${python:Provides}
+#Section: python
+#XB-Python-Version: ${python:Versions}
+#Description: GNU Radio Python Comedilib Driver
+# This package provides the Python interface to the GNU Radio driver
+# for the comedilib data acquisition hardware library.
 
 Package: python-gnuradio-cvsd-vocoder
 Architecture: any
@@ -210,62 +258,29 @@ Description: GNU Radio SDL Interface Library
 Package: python-gnuradio
 Section: python
 Architecture: all
-Depends: python-gnuradio-core, python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-atsc, python-gnuradio-comedi, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-trellis, python-gnuradio-video-sdl
+Recommends: python-gnuradio-core, python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-atsc, python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, python-gnuradio-trellis, python-gnuradio-video-sdl
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python Libraries for GNU Radio Components
  This is a virtual package that depends upon all the Python components 
  for GNU Radio.
 
-Package: gnuradio-examples
-Architecture: any
-Suggests: usrp
-Depends: ${python:Depends}, python-gnuradio-core, python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio
-Section: comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Example Programs
- This package provides examples of GNU Radio usage using Python
-
-Package: gnuradio
-Section: comm
-Architecture: all
-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
- 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
+Recommends: libgnuradio-audio-alsa-dev
+Depends: libgnuradio-core-dev, libmblock-dev, libpmt-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-firmware
-Section: contrib/comm
-Architecture: all
-Description: control applications and firmware 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
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the basic FPGA bitstrings for normal USRP operation,
- which need non-free tools to build.
-
-Package: libusrp0c2a
-Section: contrib/libs
+Package: libusrp
+Section: comm
 Architecture: any
-Depends: ${shlibs:Depends}, usrp-firmware
-Conflicts: libusrp0
-Replaces: libusrp0
+Replaces: libusrp0, libusrp0c2a, usrp-firmware
 Suggests: usrp-doc
-Description: Client side library for the USRP
+Description: Client side library for the USRP(1) hardware
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
  low-cost and open board. It features four high-speed analog-to-digital
  and digital-to-analog converters, an FPGA and a microcontroller. It's
@@ -276,11 +291,12 @@ Description: Client side library for the USRP
  This package contains the client-side library, providing an easy interface
  for communicating with the USRP.
 
-Package: libusrp0-dev
-Section: contrib/libdevel
+Package: libusrp-dev
+Section: libdevel
 Architecture: any
-Depends: libusrp0c2a (= ${binary:Version}), libusb-dev
-Description: Client side library for the USRP
+Replaces: libusrp0-dev
+Depends: libusrp (= ${binary:Version}), libusb-dev
+Description: Client side library for the USRP(1) hardware
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
  low-cost and open board. It features four high-speed analog-to-digital
  and digital-to-analog converters, an FPGA and a microcontroller. It's
@@ -293,18 +309,18 @@ Description: Client side library for the USRP
  .
  This package contains header files needed by developers.
 
-Package: libusrp-inband0c2a
-Section: contrib/libs
+Package: libusrp-inband
+Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Client side library for the USRP with in-band signaling
  The package is an alternative C++ interface to the USRP that implements
  an experimental in-band signaling method across the USB.
 
-Package: libusrp-inband0-dev
-Section: contrib/libdevel
+Package: libusrp-inband-dev
+Section: libdevel
 Architecture: any
-Depends: libusrp-inband0c2a (= ${binary:Version}), libusrp0-dev
+Depends: libusrp-inband (= ${binary:Version}), libusrp-dev
 Description: Client side library for the USRP with in-band signaling
  The package is an alternative C++ interface to the USRP that implements
  an experimental in-band signaling method across the USB.
@@ -322,7 +338,7 @@ Package: python-usrp
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
-Section: contrib/python
+Section: python
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for the USRP library
  This package provides the modules that enable one to use the USRP as a
@@ -332,7 +348,7 @@ Package: python-gnuradio-usrp
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, python-usrp
 Provides: ${python:Provides}
-Section: contrib/python
+Section: python
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
@@ -340,75 +356,72 @@ Description: Python bindings for GNU Radio USRP driver
 
 Package: gnuradio-utils
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy
 Provides: ${python:Provides}
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Utilities
  This package provides commonly used utilities for GNU Radio
 
 Package: usrp
-Section: contrib/comm
+Section: comm
 Architecture: all
-Depends: usrp-doc, usrp-firmware, libusrp0c2a
+Depends: usrp-doc, libusrp
 Description: The Universal Software Radio Peripheral
- This is a virtual package that depends on the entire USRP software collection.
+ This is a virtual package that depends on the non-GNU Radio USRP 
+ software collection.
+
+Package: gnuradio-examples
+Architecture: any
+Depends: ${python:Depends}, python-gnuradio-core
+Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Example Programs
+ This package provides examples of GNU Radio usage using Python
+
+Package: gnuradio
+Section: comm
+Architecture: all
+Recommends: gnuradio-doc, python-gnuradio, gnuradio-examples, gnuradio-utils
+Description: 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-pager
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio FLEX Pager Decoder
  This package provides a decoder for the FLEX paging protocol for GNU Radio
 
-Package: gnuradio-sounder-firmware
-Section: contrib/comm
-Architecture: all
-Description: GNU Radio Channel Sounder Application
- This package provides an RF channel sounder application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which 
- require non-free tools to build.
-
 Package: gnuradio-sounder
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-sounder-firmware
-Section: contrib/comm
+Replaces: gnuradio-sounder-firmware
+Conflicts: gnuradio-sounder-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
 
-Package: gnuradio-gpio-firmware
-Section: contrib/comm
-Architecture: all
-Description: GNU Radio Streaming GPIO Application
- This package provides streaming digital GPIO capabilities for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which 
- require non-free tools to build.
-
 Package: gnuradio-gpio
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-gpio-firmware
-Section: contrib/comm
+Replaces: gnuradio-gpio-firmware
+Conflicts: gnuradio-gpio-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Streaming Digital Application
  This package provides a streaming digital GPIO capabilities for GNU Radio
 
-Package: gnuradio-radar-mono-firmware
-Section: contrib/comm
-Architecture: all
-Description: GNU Radio Monostatic Radar Firmware
- This package provides a monostatic radar application for GNU Radio
- .
- This package contains the custom FPGA bitstrings for the USRP, which
- require non-free tools to build.
-
 Package: gnuradio-radar-mono
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, gnuradio-radar-mono-firmware
-Section: contrib/comm
+Replaces: gnuradio-radar-mono-firmware
+Conflicts: gnuradio-radar-mono-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Monostatic Radar Application
  This package provides a monostatic radar application for GNU Radio
@@ -416,7 +429,7 @@ Description: GNU Radio Monostatic Radar Application
 Package: gnuradio-radio-astronomy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, python-gnuradio-wxgui
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Radio Astronomy Applications
  This package provides radio astronomy applications for GNU Radio

diff --git a/debian/gen-install-files.sh b/debian/gen-install-files.sh
index 2d66cbb303ae3335cc9b41bccd08cf5524467ce2..9c680d34474ff7595bfd0277bd4f7b1edf309ec9 100755 (executable)
--- a/debian/gen-install-files.sh
+++ b/debian/gen-install-files.sh
@@ -2,8 +2,8 @@
 
 EXTRACT=dtools/bin/extract_install_filenames
 
-# libgnuradio-core0-dev
-NAME=debian/libgnuradio-core0-dev.install
+# libgnuradio-core-dev
+NAME=debian/libgnuradio-core-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gnuradio-core/src/lib/filter/Makefile grinclude_HEADERS >>$NAME
@@ -20,13 +20,17 @@ $EXTRACT gnuradio-core/src/lib/runtime/Makefile grinclude_HEADERS >>$NAME
 $EXTRACT gnuradio-core/src/lib/runtime/Makefile swiginclude_HEADERS >>$NAME
 $EXTRACT gnuradio-core/src/lib/swig/Makefile grinclude_HEADERS >>$NAME
 $EXTRACT gnuradio-core/src/lib/swig/Makefile swiginclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-core.so >>$NAME
+echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME
 
-# libmblock0-dev
-NAME=debian/libmblock0-dev.install
+# libmblock-dev
+NAME=debian/libmblock-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT mblock/src/lib/Makefile include_HEADERS >>$NAME
 $EXTRACT mblock/src/lib/Makefile swiginclude_HEADERS >>$NAME
+echo usr/lib/libmblock.so >>$NAME
+echo usr/lib/pkgconfig/mblock.pc >>$NAME
 
 # python-gnuradio-core
 NAME=debian/python-gnuradio-core.install
@@ -44,18 +48,22 @@ $EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON >>$N
 $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
+# libusrp-dev
+NAME=debian/libusrp-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT usrp/host/lib/legacy/Makefile include_HEADERS >>$NAME
 $EXTRACT usrp/firmware/include/Makefile include_HEADERS >>$NAME
+echo usr/lib/libusrp.so >>$NAME
+echo usr/lib/pkgconfig/usrp.pc >>$NAME
 
-# libusrp-inband0-dev
-NAME=debian/libusrp-inband0-dev.install
+# libusrp-inband-dev
+NAME=debian/libusrp-inband-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT usrp/host/lib/inband/Makefile include_HEADERS >>$NAME
+echo usr/lib/libusrp-inband.so >>$NAME
+echo usr/lib/pkgconfig/usrp-inband.pc >>$NAME
 
 # python-usrp
 NAME=debian/python-usrp.install
@@ -82,6 +90,7 @@ rm -f $NAME
 touch $NAME
 echo etc/gnuradio/conf.d/gr-wxgui.conf >>$NAME
 $EXTRACT gr-wxgui/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME
 
 # python-gnuradio-atsc
@@ -95,23 +104,34 @@ $EXTRACT gr-atsc/src/lib/Makefile ourlib_LTLIBRARIES | \
     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
+echo etc/gnuradio/conf.d/gr-audio-alsa.conf >>$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
+echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$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
 
 # python-gnuradio-audio-jack
+# TODO: break out libgnuradio-audio-jack
 NAME=debian/python-gnuradio-audio-jack.install
 rm -f $NAME
 touch $NAME
@@ -122,6 +142,7 @@ $EXTRACT gr-audio-jack/src/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-audio-oss
+# TODO: break out libgnuradio-audio-oss
 NAME=debian/python-gnuradio-audio-oss.install
 rm -f $NAME
 touch $NAME
@@ -132,6 +153,7 @@ $EXTRACT gr-audio-oss/src/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-audio-portaudio
+# TODO: break out libgnuradio-audio-portaudio
 NAME=debian/python-gnuradio-audio-portaudio.install
 rm -f $NAME
 touch $NAME
@@ -142,15 +164,16 @@ $EXTRACT gr-audio-portaudio/src/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-comedi
-NAME=debian/python-gnuradio-comedi.install
-rm -f $NAME
-touch $NAME
-$EXTRACT gr-comedi/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES | \
-    sed -e 's/\.la$/.so/' >>$NAME
+#NAME=debian/python-gnuradio-comedi.install
+#rm -f $NAME
+#touch $NAME
+#$EXTRACT gr-comedi/src/Makefile ourpython_PYTHON >>$NAME
+#$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES >>$NAME
+#$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES | \
+#    sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-cvsd-vocoder
+# TODO: break out libgnuradio-cvsd-vocoder
 NAME=debian/python-gnuradio-cvsd-vocoder.install
 rm -f $NAME
 touch $NAME
@@ -161,6 +184,7 @@ $EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-gsm-fr-vocoder
+# TODO: break out libgnuradio-gsm-fr-vocoder
 NAME=debian/python-gnuradio-gsm-fr-vocoder.install
 rm -f $NAME
 touch $NAME
@@ -170,6 +194,7 @@ $EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-trellis
+# TODO: break out libgnuradio-trellis
 NAME=debian/python-gnuradio-trellis.install
 rm -f $NAME
 touch $NAME
@@ -181,6 +206,7 @@ $EXTRACT gr-trellis/src/examples/Makefile ourdata_DATA >>$NAME
 $EXTRACT gr-trellis/src/examples/fsm_files/Makefile ourdata_DATA >>$NAME
 
 # python-gnuradio-video-sdl
+# TODO: break out libgnuradio-video-sdl
 NAME=debian/python-gnuradio-video-sdl.install
 rm -f $NAME
 touch $NAME
@@ -203,14 +229,16 @@ touch $NAME
 $EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/audio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/dect/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/digital/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/digital_voice/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/multi-antenna/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/multi_usrp/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/network/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/ofdm/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/usrp/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/usrp2/Makefile ourdata_DATA >>$NAME
 
 # gnuradio-gpio
 NAME=debian/gnuradio-gpio.install
@@ -221,6 +249,8 @@ $EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
 $EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES |
     sed -e 's/\.la$/.so/' >>$NAME
+echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME
+echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME
 
 # gnuradio-pager
 NAME=debian/gnuradio-pager.install
@@ -250,6 +280,8 @@ rm -f $NAME
 touch $NAME
 $EXTRACT gr-radar-mono/src/python/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-radar-mono/src/python/Makefile bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME
 
 # gnuradio-sounder
 NAME=debian/gnuradio-sounder.install
@@ -257,3 +289,5 @@ rm -f $NAME
 touch $NAME
 $EXTRACT gr-sounder/src/python/Makefile ourpython_PYTHON >>$NAME
 $EXTRACT gr-sounder/src/python/Makefile bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_sounder.rbf
+echo usr/share/usrp/rev4/usrp_sounder.rbf

diff --git a/debian/gnuradio-doc.install b/debian/gnuradio-doc.install
index 08f1e5de5085411e8e95ad6405af6963eae72673..f7d331cb78b1d5e84df7b058dff8ebf7a7582a47 100644 (file)
--- a/debian/gnuradio-doc.install
+++ b/debian/gnuradio-doc.install
@@ -1,2 +1,3 @@
+usr/share/doc/gnuradio*/README* /usr/share/doc/gnuradio-doc
 usr/share/doc/gnuradio*/html usr/share/doc/gnuradio-doc
-usr/share/doc/gnuradio*/README /usr/share/doc/gnuradio-doc
+usr/share/doc/gnuradio*/xml usr/share/doc/gnuradio-doc

diff --git a/debian/gnuradio-gpio-firmware.install b/debian/gnuradio-gpio-firmware.install
deleted file mode 100644 (file)
index 61dde15..0000000
--- a/debian/gnuradio-gpio-firmware.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf
-usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf

diff --git a/debian/gnuradio-radar-mono-firmware.install b/debian/gnuradio-radar-mono-firmware.install
deleted file mode 100644 (file)
index a73ec45..0000000
--- a/debian/gnuradio-radar-mono-firmware.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/usrp/rev2/usrp_radar_mono.rbf
-usr/share/usrp/rev4/usrp_radar_mono.rbf
-

diff --git a/debian/gnuradio-sounder-firmware.install b/debian/gnuradio-sounder-firmware.install
deleted file mode 100644 (file)
index 9c5e731..0000000
--- a/debian/gnuradio-sounder-firmware.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/usrp/rev2/usrp_sounder.rbf
-usr/share/usrp/rev4/usrp_sounder.rbf
-

diff --git a/debian/install-build-deps.sh b/debian/install-build-deps.sh
index 6b645dfbb3015ee2f9c493b4718c8116eae958d5..256717eb346f11bb5b791ab2a2bc22d85d988bfd 100755 (executable)
--- a/debian/install-build-deps.sh
+++ b/debian/install-build-deps.sh
@@ -8,9 +8,10 @@ else
     FFTW3DEV=libfftw3-dev
 fi
 
-sudo apt-get install \
-    build-essential automake autotools-dev doxygen $FFTW3DEV guile-1.8 \
-    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.8 sdcc swig xmlto
-
+# FIXME: these are missing gr-comedi and gr-qtgui dependencies
+sudo apt-get install build-essential automake libtool pkg-config \
+    python-dev swig $FFTW3DEV libcppunit-dev libboost1.35-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-opengl python-matplotlib python-tk \
+    python-cheetah python-gtk2 python-lxml

diff --git a/debian/libgnuradio-core-dev.dirs b/debian/libgnuradio-core-dev.dirs
new file mode 100644 (file)
index 0000000..5c5a15f
--- /dev/null
+++ b/debian/libgnuradio-core-dev.dirs
@@ -0,0 +1,3 @@
+usr/lib/pkgconfig
+usr/include/gnuradio
+usr/include/gnuradio/swig

diff --git a/debian/libgnuradio-core.dirs b/debian/libgnuradio-core.dirs
new file mode 100644 (file)
index 0000000..3462501
--- /dev/null
+++ b/debian/libgnuradio-core.dirs
@@ -0,0 +1 @@
+etc/gnuradio/conf.d

diff --git a/debian/libgnuradio-core.install b/debian/libgnuradio-core.install
new file mode 100644 (file)
index 0000000..e5c1d70
--- /dev/null
+++ b/debian/libgnuradio-core.install
@@ -0,0 +1,3 @@
+etc/gnuradio/conf.d/gnuradio-core.conf
+usr/lib/libgnuradio-core.la
+usr/lib/libgnuradio-core.so.*

diff --git a/debian/libgnuradio-core0-dev.dirs b/debian/libgnuradio-core0-dev.dirs
deleted file mode 100644 (file)
index 636247f..0000000
--- a/debian/libgnuradio-core0-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/gnuradio
-usr/include/gnuradio/swig

diff --git a/debian/libgnuradio-core0c2a.dirs b/debian/libgnuradio-core0c2a.dirs
deleted file mode 100644 (file)
index a0384c8..0000000
--- a/debian/libgnuradio-core0c2a.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/gnuradio/conf.d
-usr/lib
-usr/lib/pkgconfig

diff --git a/debian/libgnuradio-core0c2a.install b/debian/libgnuradio-core0c2a.install
deleted file mode 100644 (file)
index 051e964..0000000
--- a/debian/libgnuradio-core0c2a.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/gnuradio/conf.d/gnuradio-core.conf
-usr/lib/libgnuradio-core.la
-usr/lib/libgnuradio-core.so*
-usr/lib/pkgconfig/gnuradio-core.pc

diff --git a/debian/libgnuradio-omnithread-dev.dirs b/debian/libgnuradio-omnithread-dev.dirs
new file mode 100644 (file)
index 0000000..79e3d42
--- /dev/null
+++ b/debian/libgnuradio-omnithread-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/include/gnuradio

diff --git a/debian/libgnuradio-omnithread-dev.install b/debian/libgnuradio-omnithread-dev.install
new file mode 100644 (file)
index 0000000..3ebc341
--- /dev/null
+++ b/debian/libgnuradio-omnithread-dev.install
@@ -0,0 +1,5 @@
+usr/include/gnuradio/omni_time.h
+usr/include/gnuradio/omnithread.h
+usr/include/gnuradio/ot_posix.h
+usr/lib/pkgconfig/gnuradio-omnithread.pc
+usr/lib/libgromnithread.so

diff --git a/debian/libgnuradio-omnithread.install b/debian/libgnuradio-omnithread.install
new file mode 100644 (file)
index 0000000..8910fb3
--- /dev/null
+++ b/debian/libgnuradio-omnithread.install
@@ -0,0 +1,2 @@
+usr/lib/libgromnithread.la
+usr/lib/libgromnithread.so.*

diff --git a/debian/libgnuradio-omnithread0-dev.dirs b/debian/libgnuradio-omnithread0-dev.dirs
deleted file mode 100644 (file)
index a1143b5..0000000
--- a/debian/libgnuradio-omnithread0-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/gnuradio

diff --git a/debian/libgnuradio-omnithread0-dev.install b/debian/libgnuradio-omnithread0-dev.install
deleted file mode 100644 (file)
index 4bbc352..0000000
--- a/debian/libgnuradio-omnithread0-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/gnuradio/omnithread.h
-usr/include/gnuradio/ot_posix.h

diff --git a/debian/libgnuradio-omnithread0c2a.dirs b/debian/libgnuradio-omnithread0c2a.dirs
deleted file mode 100644 (file)
index c51e8f7..0000000
--- a/debian/libgnuradio-omnithread0c2a.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib
-usr/lib/pkgconfig
-
-

diff --git a/debian/libgnuradio-omnithread0c2a.install b/debian/libgnuradio-omnithread0c2a.install
deleted file mode 100644 (file)
index 128b398..0000000
--- a/debian/libgnuradio-omnithread0c2a.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libgromnithread.la
-usr/lib/libgromnithread*.so*
-usr/lib/pkgconfig/gnuradio-omnithread.pc

diff --git a/debian/libgruel-dev.dirs b/debian/libgruel-dev.dirs
new file mode 100644 (file)
index 0000000..bd76ada
--- /dev/null
+++ b/debian/libgruel-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/include/gruel

diff --git a/debian/libgruel-dev.install b/debian/libgruel-dev.install
new file mode 100644 (file)
index 0000000..c5cb6b6
--- /dev/null
+++ b/debian/libgruel-dev.install
@@ -0,0 +1,3 @@
+usr/include/gruel/*
+usr/lib/libgruel.so
+usr/lib/pkgconfig/gruel.pc

diff --git a/debian/libgruel.install b/debian/libgruel.install
new file mode 100644 (file)
index 0000000..54d2b99
--- /dev/null
+++ b/debian/libgruel.install
@@ -0,0 +1,4 @@
+usr/lib/libgruel.la
+usr/lib/libgruel.so.*
+
+

diff --git a/debian/libmblock.install b/debian/libmblock.install
new file mode 100644 (file)
index 0000000..cc78952
--- /dev/null
+++ b/debian/libmblock.install
@@ -0,0 +1,3 @@
+usr/lib/libmblock.la
+usr/lib/libmblock.so.*
+

diff --git a/debian/libmblock0c2a.dirs b/debian/libmblock0c2a.dirs
deleted file mode 100644 (file)
index b448f1a..0000000
--- a/debian/libmblock0c2a.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/pkgconfig

diff --git a/debian/libmblock0c2a.install b/debian/libmblock0c2a.install
deleted file mode 100644 (file)
index 8e96520..0000000
--- a/debian/libmblock0c2a.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/pkgconfig/mblock.pc
-usr/lib/libmblock.la
-usr/lib/libmblock*.so*
-

diff --git a/debian/libpmt-dev.install b/debian/libpmt-dev.install
new file mode 100644 (file)
index 0000000..8b30e6e
--- /dev/null
+++ b/debian/libpmt-dev.install
@@ -0,0 +1,5 @@
+usr/include/pmt.h
+usr/include/pmt_pool.h
+usr/include/pmt_serial_tags.h
+usr/lib/libpmt.so
+usr/lib/pkgconfig/pmt.pc

diff --git a/debian/libpmt.install b/debian/libpmt.install
new file mode 100644 (file)
index 0000000..c6f0ba6
--- /dev/null
+++ b/debian/libpmt.install
@@ -0,0 +1,2 @@
+usr/lib/libpmt.la
+usr/lib/libpmt.so.*

diff --git a/debian/libpmt0-dev.dirs b/debian/libpmt0-dev.dirs
deleted file mode 100644 (file)
index a1143b5..0000000
--- a/debian/libpmt0-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/gnuradio

diff --git a/debian/libpmt0-dev.install b/debian/libpmt0-dev.install
deleted file mode 100644 (file)
index 2d3f0d7..0000000
--- a/debian/libpmt0-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/pmt.h
-usr/include/pmt_pool.h
-usr/include/pmt_serial_tags.h

diff --git a/debian/libpmt0c2a.dirs b/debian/libpmt0c2a.dirs
deleted file mode 100644 (file)
index c926d58..0000000
--- a/debian/libpmt0c2a.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib
-usr/lib/pkgconfig
-usr/share/gnuradio
-

diff --git a/debian/libpmt0c2a.install b/debian/libpmt0c2a.install
deleted file mode 100644 (file)
index 1f50f05..0000000
--- a/debian/libpmt0c2a.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libpmt.la
-usr/lib/libpmt*.so*
-usr/lib/pkgconfig/pmt.pc

diff --git a/debian/libusrp-inband.install b/debian/libusrp-inband.install
new file mode 100644 (file)
index 0000000..f55f214
--- /dev/null
+++ b/debian/libusrp-inband.install
@@ -0,0 +1,2 @@
+usr/lib/libusrp-inband.la
+usr/lib/libusrp-inband.so.*

diff --git a/debian/libusrp-inband0c2a.dirs b/debian/libusrp-inband0c2a.dirs
deleted file mode 100644 (file)
index b448f1a..0000000
--- a/debian/libusrp-inband0c2a.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/pkgconfig

diff --git a/debian/libusrp-inband0c2a.install b/debian/libusrp-inband0c2a.install
deleted file mode 100644 (file)
index 4c85f40..0000000
--- a/debian/libusrp-inband0c2a.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/pkgconfig/usrp-inband.pc
-usr/lib/libusrp_inband.la
-usr/lib/libusrp_inband.so.*

diff --git a/debian/libusrp.dirs b/debian/libusrp.dirs
new file mode 100644 (file)
index 0000000..cb9eb42
--- /dev/null
+++ b/debian/libusrp.dirs
@@ -0,0 +1,3 @@
+etc/udev/rules.d
+/usr/share/usrp/rev2
+/usr/share/usrp/rev4

diff --git a/debian/libusrp.install b/debian/libusrp.install
new file mode 100644 (file)
index 0000000..1cabb1f
--- /dev/null
+++ b/debian/libusrp.install
@@ -0,0 +1,11 @@
+usr/lib/libusrp.la
+usr/lib/libusrp.so.*
+etc/udev/rules.d/40-usrp.rules
+usr/share/usrp/rev2/multi_2rxhb_2tx.rbf
+usr/share/usrp/rev2/std.ihx
+usr/share/usrp/rev2/std_2rxhb_2tx.rbf
+usr/share/usrp/rev2/std_4rx_0tx.rbf
+usr/share/usrp/rev4/multi_2rxhb_2tx.rbf
+usr/share/usrp/rev4/std.ihx
+usr/share/usrp/rev4/std_2rxhb_2tx.rbf
+usr/share/usrp/rev4/std_4rx_0tx.rbf

diff --git a/debian/libusrp.postinst b/debian/libusrp.postinst
new file mode 100644 (file)
index 0000000..6ed2f9e
--- /dev/null
+++ b/debian/libusrp.postinst
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+       exit 0
+fi
+
+# Create usrp group for udev access
+if ! getent group usrp >/dev/null; then
+    addgroup --system usrp
+fi
+
+exit 0

diff --git a/debian/libusrp.postrm b/debian/libusrp.postrm
new file mode 100644 (file)
index 0000000..4abb561
--- /dev/null
+++ b/debian/libusrp.postrm
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "remove" ]; then
+       exit 0
+fi
+
+rm -f /etc/udev/rules.d/40-usrp.rules
+
+exit 0

diff --git a/debian/libusrp.udev b/debian/libusrp.udev
new file mode 100644 (file)
index 0000000..e45dc29
--- /dev/null
+++ b/debian/libusrp.udev
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660"

diff --git a/debian/libusrp0c2a.dirs b/debian/libusrp0c2a.dirs
deleted file mode 100644 (file)
index c5a0290..0000000
--- a/debian/libusrp0c2a.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/lib/pkgconfig
-etc/udev/rules.d

diff --git a/debian/libusrp0c2a.install b/debian/libusrp0c2a.install
deleted file mode 100644 (file)
index e6620cb..0000000
--- a/debian/libusrp0c2a.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libusrp.la
-usr/lib/libusrp.so*
-usr/lib/pkgconfig/usrp.pc
-etc/udev/rules.d/40-usrp.rules

diff --git a/debian/libusrp0c2a.postinst b/debian/libusrp0c2a.postinst
deleted file mode 100644 (file)
index 6ed2f9e..0000000
--- a/debian/libusrp0c2a.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" != "configure" ]; then
-       exit 0
-fi
-
-# Create usrp group for udev access
-if ! getent group usrp >/dev/null; then
-    addgroup --system usrp
-fi
-
-exit 0

diff --git a/debian/libusrp0c2a.postrm b/debian/libusrp0c2a.postrm
deleted file mode 100644 (file)
index 4abb561..0000000
--- a/debian/libusrp0c2a.postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" != "remove" ]; then
-       exit 0
-fi
-
-rm -f /etc/udev/rules.d/40-usrp.rules
-
-exit 0

diff --git a/debian/libusrp0c2a.udev b/debian/libusrp0c2a.udev
deleted file mode 100644 (file)
index e45dc29..0000000
--- a/debian/libusrp0c2a.udev
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660"

diff --git a/debian/pyversions b/debian/pyversions
index 57a7586e4b339553ca15ce2f76600a89f5c6d01d..95e3ba8192053fb4a18be631cb8d273638ac768b 100644 (file)
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.3-
+2.5

diff --git a/debian/rules b/debian/rules
index 00348e26e938ec0158363977c90e7b593f15eb8d..2bbec0fa4bc4e16b9c103673286e145b3670149e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,8 @@ configure-stamp:
                --enable-doxygen --enable-html-docs \
                --sysconfdir=/etc --enable-all-components \
                --disable-gr-audio-osx --disable-gr-audio-windows \
-               --disable-gr-qtgui
+               --disable-gr-qtgui --disable-gcell --disable-gr-gcell \
+               --disable-gr-comedi --disable-usrp2-firmware
        touch configure-stamp
 
 extract: extract-stamp
@@ -81,7 +82,7 @@ install-stamp: build-stamp
        done
 
        : # Deposit rule to allow group 'usrp' access to USRP hardware
-       install -m 0755 -D debian/libusrp0c2a.udev \
+       install -m 0644 -D debian/libusrp.udev \
                debian/tmp/etc/udev/rules.d/40-usrp.rules
 
        dh_install --sourcedir=debian/tmp

diff --git a/debian/usrp-firmware.dirs b/debian/usrp-firmware.dirs
deleted file mode 100644 (file)
index 6195915..0000000
--- a/debian/usrp-firmware.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/usrp/rev2
-/usr/share/usrp/rev4

diff --git a/debian/usrp-firmware.install b/debian/usrp-firmware.install
deleted file mode 100644 (file)
index bf9fab8..0000000
--- a/debian/usrp-firmware.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/usrp/rev2/multi_2rxhb_2tx.rbf
-usr/share/usrp/rev2/std.ihx
-usr/share/usrp/rev2/std_2rxhb_2tx.rbf
-usr/share/usrp/rev2/std_4rx_0tx.rbf
-usr/share/usrp/rev4/multi_2rxhb_2tx.rbf
-usr/share/usrp/rev4/std.ihx
-usr/share/usrp/rev4/std_2rxhb_2tx.rbf
-usr/share/usrp/rev4/std_4rx_0tx.rbf

diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in
index ede8238232441a9331d4662cfd40ef5cf75fb634..2c507fa22738b840d478c62df29f145d3587baa8 100644 (file)
--- a/gnuradio-core/gnuradio-core.pc.in
+++ b/gnuradio-core/gnuradio-core.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@/gnuradio
 
 Name: gnuradio-core
 Description: GNU Software Radio toolkit
-Requires: gruel fftw3f gnuradio-omnithread
+Requires: gruel fftw3f gsl gnuradio-omnithread
 Version: @VERSION@
 Libs: -L${libdir} -lgnuradio-core @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@
 Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir} @DEFINES@

diff --git a/gnuradio-examples/c++/dial_tone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am
index aaa7e1ef10009be7a375b4e39486d444a74fbc4c..8acb54709a661fbabaa713ebb203e0c94b0adfc7 100644 (file)
--- a/gnuradio-examples/c++/dial_tone/Makefile.am
+++ b/gnuradio-examples/c++/dial_tone/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
          -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
 

diff --git a/gr-audio-alsa/Makefile.am b/gr-audio-alsa/Makefile.am
index 83c92a06038e7287b4570dc3ab0f72f524b76969..a18195d12a2a0773c354b721a42b5820cb480811 100644 (file)
--- a/gr-audio-alsa/Makefile.am
+++ b/gr-audio-alsa/Makefile.am
@@ -21,12 +21,14 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = gr-audio-alsa.conf
+EXTRA_DIST = \
+    gr-audio-alsa.conf \
+    gr-audio-alsa.pc.in
 
 SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
+pkgconfig_DATA = gr-audio-alsa.pc
 
 etcdir = $(sysconfdir)/gnuradio/conf.d
 etc_DATA = gr-audio-alsa.conf

diff --git a/gr-audio-alsa/gr-audio-alsa.pc.in b/gr-audio-alsa/gr-audio-alsa.pc.in
new file mode 100644 (file)
index 0000000..c54f6c3
--- /dev/null
+++ b/gr-audio-alsa/gr-audio-alsa.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: mblock
+Description: The GNU Radio block for the ALSA sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-alsa
+Cflags: -I${includedir}

diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index 742af80b56a0ffdbbdb0e83a6160c159317c8e6f..90b47e9d350145c3f8106a95420f48563e1a10b8 100644 (file)
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -56,12 +56,12 @@ SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
 
 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 @@ _audio_alsa_la_LIBADD =             \
        $(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@
 

diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
index 447d0a61d31589b61cf55b283f1cd4c6ba5da37d..ca9009f54ad369e91308a80aeba7ccf82b94f048 100644 (file)
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -32,8 +32,8 @@ EXTRA_DIST =                          \
        usrp_interface.mbh 
 
 lib_LTLIBRARIES =                      \
-       libusrp_inband.la               \
-       libusrp_inband-qa.la
+       libusrp-inband.la               \
+       libusrp-inband-qa.la
 
 # ------------------------------------------------------------------------
 # Build the inband library
@@ -100,7 +100,7 @@ libusrp_inband_qa_la_SOURCES =      \
 libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libusrp_inband_qa_la_LIBADD =          \
-       libusrp_inband.la               \
+       libusrp-inband.la               \
        $(PMT_LA)                       \
        $(CPPUNIT_LIBS)                 \
        -lstdc++
@@ -111,7 +111,7 @@ noinst_PROGRAMS =                   \
        test_inband
 
 test_inband_SOURCES = test_inband.cc
-test_inband_LDADD   = libusrp_inband-qa.la
+test_inband_LDADD   = libusrp-inband-qa.la
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc