[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9918 - in gnuradio/trunk: config debian gnuradio-core
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r9918 - in gnuradio/trunk: config debian gnuradio-core gnuradio-examples/c++/dial_tone gr-audio-alsa gr-audio-alsa/src usrp/host/lib/inband |
|
Date: |
Mon, 3 Nov 2008 13:08:40 -0700 (MST) |
Author: jcorgan
Date: 2008-11-03 13:08:39 -0700 (Mon, 03 Nov 2008)
New Revision: 9918
Added:
gnuradio/trunk/debian/libgnuradio-core-dev.dirs
gnuradio/trunk/debian/libgnuradio-core.dirs
gnuradio/trunk/debian/libgnuradio-core.install
gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs
gnuradio/trunk/debian/libgnuradio-omnithread-dev.install
gnuradio/trunk/debian/libgnuradio-omnithread.install
gnuradio/trunk/debian/libgruel-dev.dirs
gnuradio/trunk/debian/libgruel-dev.install
gnuradio/trunk/debian/libgruel.install
gnuradio/trunk/debian/libmblock.install
gnuradio/trunk/debian/libpmt-dev.install
gnuradio/trunk/debian/libpmt.install
gnuradio/trunk/debian/libusrp-inband.install
gnuradio/trunk/debian/libusrp.dirs
gnuradio/trunk/debian/libusrp.install
gnuradio/trunk/debian/libusrp.postinst
gnuradio/trunk/debian/libusrp.postrm
gnuradio/trunk/debian/libusrp.udev
gnuradio/trunk/gr-audio-alsa/gr-audio-alsa.pc.in
Removed:
gnuradio/trunk/debian/gnuradio-gpio-firmware.install
gnuradio/trunk/debian/gnuradio-radar-mono-firmware.install
gnuradio/trunk/debian/gnuradio-sounder-firmware.install
gnuradio/trunk/debian/libgnuradio-core0-dev.dirs
gnuradio/trunk/debian/libgnuradio-core0c2a.dirs
gnuradio/trunk/debian/libgnuradio-core0c2a.install
gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs
gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install
gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs
gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install
gnuradio/trunk/debian/libmblock0c2a.dirs
gnuradio/trunk/debian/libmblock0c2a.install
gnuradio/trunk/debian/libpmt0-dev.dirs
gnuradio/trunk/debian/libpmt0-dev.install
gnuradio/trunk/debian/libpmt0c2a.dirs
gnuradio/trunk/debian/libpmt0c2a.install
gnuradio/trunk/debian/libusrp-inband0c2a.dirs
gnuradio/trunk/debian/libusrp-inband0c2a.install
gnuradio/trunk/debian/libusrp0c2a.dirs
gnuradio/trunk/debian/libusrp0c2a.install
gnuradio/trunk/debian/libusrp0c2a.postinst
gnuradio/trunk/debian/libusrp0c2a.postrm
gnuradio/trunk/debian/libusrp0c2a.udev
gnuradio/trunk/debian/usrp-firmware.dirs
gnuradio/trunk/debian/usrp-firmware.install
Modified:
gnuradio/trunk/config/
gnuradio/trunk/config/gr_python.m4
gnuradio/trunk/config/grc_gr_audio_alsa.m4
gnuradio/trunk/config/grc_gr_comedi.m4
gnuradio/trunk/config/grc_gr_wxgui.m4
gnuradio/trunk/config/grc_grc.m4
gnuradio/trunk/config/grc_usrp.m4
gnuradio/trunk/debian/
gnuradio/trunk/debian/changelog
gnuradio/trunk/debian/control
gnuradio/trunk/debian/gen-install-files.sh
gnuradio/trunk/debian/gnuradio-doc.install
gnuradio/trunk/debian/install-build-deps.sh
gnuradio/trunk/debian/pyversions
gnuradio/trunk/debian/rules
gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in
gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am
gnuradio/trunk/gr-audio-alsa/Makefile.am
gnuradio/trunk/gr-audio-alsa/src/Makefile.am
gnuradio/trunk/usrp/host/lib/inband/Makefile.am
Log:
Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu
packaging system to build trunk code on Ubuntu 8.10.
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).
Property changes on: gnuradio/trunk/config
___________________________________________________________________
Name: svn:ignore
- *.cache
*.la
*.lo
*.pc
.deps
.la
.libs
.lo
Makefile
Makefile.in
+ *.cache
*.la
*.lo
*.pc
.deps
.la
.libs
.lo
Makefile
Makefile.in
libtool.m4
lt~obsolete.m4
ltsugar.m4
ltversion.m4
ltoptions.m4
Modified: gnuradio/trunk/config/gr_python.m4
===================================================================
--- gnuradio/trunk/config/gr_python.m4 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/config/gr_python.m4 2008-11-03 20:08:39 UTC (rev 9918)
@@ -126,3 +126,29 @@
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
+])
Modified: gnuradio/trunk/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_alsa.m4 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/config/grc_gr_audio_alsa.m4 2008-11-03 20:08:39 UTC (rev
9918)
@@ -35,6 +35,7 @@
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 \
])
Modified: gnuradio/trunk/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_comedi.m4 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/config/grc_gr_comedi.m4 2008-11-03 20:08:39 UTC (rev
9918)
@@ -29,7 +29,7 @@
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
Modified: gnuradio/trunk/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_wxgui.m4 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/config/grc_gr_wxgui.m4 2008-11-03 20:08:39 UTC (rev
9918)
@@ -29,14 +29,8 @@
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([ \
Modified: gnuradio/trunk/config/grc_grc.m4
===================================================================
--- gnuradio/trunk/config/grc_grc.m4 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/config/grc_grc.m4 2008-11-03 20:08:39 UTC (rev 9918)
@@ -29,18 +29,9 @@
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 ########################################
Modified: gnuradio/trunk/config/grc_usrp.m4
===================================================================
--- gnuradio/trunk/config/grc_usrp.m4 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/config/grc_usrp.m4 2008-11-03 20:08:39 UTC (rev 9918)
@@ -61,7 +61,7 @@
-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
Property changes on: gnuradio/trunk/debian
___________________________________________________________________
Name: svn:ignore
- libmblock0-dev.install
libgnuradio-core0-dev.install
libusrp0-dev.install
libusrp-inband0-dev.install
python-gnuradio-core.install
python-gnuradio-audio-alsa.install
python-gnuradio-usrp.install
python-gnuradio-wxgui.install
python-gnuradio-atsc.install
python-gnuradio-gsm-fr-vocoder.install
python-gnuradio-comedi.install
python-gnuradio-audio-oss.install
python-gnuradio-audio-portaudio.install
python-gnuradio-audio-jack.install
python-gnuradio-trellis.install
python-gnuradio-video-sdl.install
python-gnuradio-cvsd-vocoder.install
python-usrp.install
python-gnuradio-utils.install
gnuradio-examples.install
gnuradio-radio-astronomy.install
gnuradio-pager.install
gnuradio-radar-mono.install
gnuradio-sounder.install
+
Modified: gnuradio/trunk/debian/changelog
===================================================================
--- gnuradio/trunk/debian/changelog 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/debian/changelog 2008-11-03 20:08:39 UTC (rev 9918)
@@ -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
Modified: gnuradio/trunk/debian/control
===================================================================
--- gnuradio/trunk/debian/control 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/debian/control 2008-11-03 20:08:39 UTC (rev 9918)
@@ -3,83 +3,115 @@
Priority: optional
Maintainer: Johnathan Corgan <address@hidden>
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
.
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 @@
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 @@
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 @@
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 @@
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
Modified: gnuradio/trunk/debian/gen-install-files.sh
===================================================================
--- gnuradio/trunk/debian/gen-install-files.sh 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/debian/gen-install-files.sh 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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 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/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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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/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 @@
$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/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 @@
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 @@
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
Modified: gnuradio/trunk/debian/gnuradio-doc.install
===================================================================
--- gnuradio/trunk/debian/gnuradio-doc.install 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/debian/gnuradio-doc.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Deleted: gnuradio/trunk/debian/gnuradio-gpio-firmware.install
Deleted: gnuradio/trunk/debian/gnuradio-radar-mono-firmware.install
Deleted: gnuradio/trunk/debian/gnuradio-sounder-firmware.install
Modified: gnuradio/trunk/debian/install-build-deps.sh
===================================================================
--- gnuradio/trunk/debian/install-build-deps.sh 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/debian/install-build-deps.sh 2008-11-03 20:08:39 UTC (rev
9918)
@@ -8,9 +8,10 @@
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
Copied: gnuradio/trunk/debian/libgnuradio-core-dev.dirs (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core-dev.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-core-dev.dirs
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-core-dev.dirs 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -0,0 +1,3 @@
+usr/lib/pkgconfig
+usr/include/gnuradio
+usr/include/gnuradio/swig
Copied: gnuradio/trunk/debian/libgnuradio-core.dirs (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-core.dirs (rev 0)
+++ gnuradio/trunk/debian/libgnuradio-core.dirs 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1 @@
+etc/gnuradio/conf.d
Copied: gnuradio/trunk/debian/libgnuradio-core.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-core.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-core.install
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-core.install 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -0,0 +1,3 @@
+etc/gnuradio/conf.d/gnuradio-core.conf
+usr/lib/libgnuradio-core.la
+usr/lib/libgnuradio-core.so.*
Deleted: gnuradio/trunk/debian/libgnuradio-core0-dev.dirs
Deleted: gnuradio/trunk/debian/libgnuradio-core0c2a.dirs
Deleted: gnuradio/trunk/debian/libgnuradio-core0c2a.install
Copied: gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread-dev.dirs 2008-11-03
20:08:39 UTC (rev 9918)
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/include/gnuradio
Copied: gnuradio/trunk/debian/libgnuradio-omnithread-dev.install (from rev
9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread-dev.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread-dev.install
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread-dev.install 2008-11-03
20:08:39 UTC (rev 9918)
@@ -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
Copied: gnuradio/trunk/debian/libgnuradio-omnithread.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgnuradio-omnithread.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread.install
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread.install 2008-11-03
20:08:39 UTC (rev 9918)
@@ -0,0 +1,2 @@
+usr/lib/libgromnithread.la
+usr/lib/libgromnithread.so.*
Deleted: gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs
Deleted: gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install
Deleted: gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs
Deleted: gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install
Copied: gnuradio/trunk/debian/libgruel-dev.dirs (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgruel-dev.dirs)
===================================================================
--- gnuradio/trunk/debian/libgruel-dev.dirs (rev 0)
+++ gnuradio/trunk/debian/libgruel-dev.dirs 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/include/gruel
Copied: gnuradio/trunk/debian/libgruel-dev.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgruel-dev.install)
===================================================================
--- gnuradio/trunk/debian/libgruel-dev.install (rev 0)
+++ gnuradio/trunk/debian/libgruel-dev.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1,3 @@
+usr/include/gruel/*
+usr/lib/libgruel.so
+usr/lib/pkgconfig/gruel.pc
Copied: gnuradio/trunk/debian/libgruel.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libgruel.install)
===================================================================
--- gnuradio/trunk/debian/libgruel.install (rev 0)
+++ gnuradio/trunk/debian/libgruel.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1,4 @@
+usr/lib/libgruel.la
+usr/lib/libgruel.so.*
+
+
Copied: gnuradio/trunk/debian/libmblock.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libmblock.install)
===================================================================
--- gnuradio/trunk/debian/libmblock.install (rev 0)
+++ gnuradio/trunk/debian/libmblock.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1,3 @@
+usr/lib/libmblock.la
+usr/lib/libmblock.so.*
+
Deleted: gnuradio/trunk/debian/libmblock0c2a.dirs
Deleted: gnuradio/trunk/debian/libmblock0c2a.install
Copied: gnuradio/trunk/debian/libpmt-dev.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt-dev.install)
===================================================================
--- gnuradio/trunk/debian/libpmt-dev.install (rev 0)
+++ gnuradio/trunk/debian/libpmt-dev.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Copied: gnuradio/trunk/debian/libpmt.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libpmt.install)
===================================================================
--- gnuradio/trunk/debian/libpmt.install (rev 0)
+++ gnuradio/trunk/debian/libpmt.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -0,0 +1,2 @@
+usr/lib/libpmt.la
+usr/lib/libpmt.so.*
Deleted: gnuradio/trunk/debian/libpmt0-dev.dirs
Deleted: gnuradio/trunk/debian/libpmt0-dev.install
Deleted: gnuradio/trunk/debian/libpmt0c2a.dirs
Deleted: gnuradio/trunk/debian/libpmt0c2a.install
Copied: gnuradio/trunk/debian/libusrp-inband.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install)
===================================================================
--- gnuradio/trunk/debian/libusrp-inband.install
(rev 0)
+++ gnuradio/trunk/debian/libusrp-inband.install 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -0,0 +1,2 @@
+usr/lib/libusrp-inband.la
+usr/lib/libusrp-inband.so.*
Deleted: gnuradio/trunk/debian/libusrp-inband0c2a.dirs
Deleted: gnuradio/trunk/debian/libusrp-inband0c2a.install
Copied: gnuradio/trunk/debian/libusrp.dirs (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs)
===================================================================
--- gnuradio/trunk/debian/libusrp.dirs (rev 0)
+++ gnuradio/trunk/debian/libusrp.dirs 2008-11-03 20:08:39 UTC (rev 9918)
@@ -0,0 +1,3 @@
+etc/udev/rules.d
+/usr/share/usrp/rev2
+/usr/share/usrp/rev4
Copied: gnuradio/trunk/debian/libusrp.install (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install)
===================================================================
--- gnuradio/trunk/debian/libusrp.install (rev 0)
+++ gnuradio/trunk/debian/libusrp.install 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Copied: gnuradio/trunk/debian/libusrp.postinst (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst)
===================================================================
--- gnuradio/trunk/debian/libusrp.postinst (rev 0)
+++ gnuradio/trunk/debian/libusrp.postinst 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Copied: gnuradio/trunk/debian/libusrp.postrm (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm)
===================================================================
--- gnuradio/trunk/debian/libusrp.postrm (rev 0)
+++ gnuradio/trunk/debian/libusrp.postrm 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Copied: gnuradio/trunk/debian/libusrp.udev (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev)
===================================================================
--- gnuradio/trunk/debian/libusrp.udev (rev 0)
+++ gnuradio/trunk/debian/libusrp.udev 2008-11-03 20:08:39 UTC (rev 9918)
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002",
GROUP:="usrp", MODE:="0660"
Deleted: gnuradio/trunk/debian/libusrp0c2a.dirs
Deleted: gnuradio/trunk/debian/libusrp0c2a.install
Deleted: gnuradio/trunk/debian/libusrp0c2a.postinst
Deleted: gnuradio/trunk/debian/libusrp0c2a.postrm
Deleted: gnuradio/trunk/debian/libusrp0c2a.udev
Modified: gnuradio/trunk/debian/pyversions
===================================================================
--- gnuradio/trunk/debian/pyversions 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/debian/pyversions 2008-11-03 20:08:39 UTC (rev 9918)
@@ -1 +1 @@
-2.3-
+2.5
Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2008-11-03 19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/debian/rules 2008-11-03 20:08:39 UTC (rev 9918)
@@ -48,7 +48,8 @@
--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 @@
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
Deleted: gnuradio/trunk/debian/usrp-firmware.dirs
Deleted: gnuradio/trunk/debian/usrp-firmware.install
Modified: gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in
===================================================================
--- gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in 2008-11-03 19:52:52 UTC
(rev 9917)
+++ gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -5,7 +5,7 @@
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@
Modified: gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am 2008-11-03
19:52:52 UTC (rev 9917)
+++ gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am 2008-11-03
20:08:39 UTC (rev 9918)
@@ -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/trunk/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/Makefile.am 2008-11-03 19:52:52 UTC (rev
9917)
+++ gnuradio/trunk/gr-audio-alsa/Makefile.am 2008-11-03 20:08:39 UTC (rev
9918)
@@ -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
Copied: gnuradio/trunk/gr-audio-alsa/gr-audio-alsa.pc.in (from rev 9917,
gnuradio/branches/developers/jcorgan/deb-wip/gr-audio-alsa/gr-audio-alsa.pc.in)
===================================================================
--- gnuradio/trunk/gr-audio-alsa/gr-audio-alsa.pc.in
(rev 0)
+++ gnuradio/trunk/gr-audio-alsa/gr-audio-alsa.pc.in 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+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}
Modified: gnuradio/trunk/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2008-11-03 19:52:52 UTC
(rev 9917)
+++ gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -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@
Modified: gnuradio/trunk/usrp/host/lib/inband/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/Makefile.am 2008-11-03 19:52:52 UTC
(rev 9917)
+++ gnuradio/trunk/usrp/host/lib/inband/Makefile.am 2008-11-03 20:08:39 UTC
(rev 9918)
@@ -32,8 +32,8 @@
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_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 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9918 - in gnuradio/trunk: config debian gnuradio-core gnuradio-examples/c++/dial_tone gr-audio-alsa gr-audio-alsa/src usrp/host/lib/inband,
jcorgan <=