[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11009 - in gnuradio/branches/releases/3.2: . config d
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11009 - in gnuradio/branches/releases/3.2: . config debian gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/lib gr-qtgui/src/python gr-usrp2 gr-usrp2/src gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp/host/lib/legacy |
|
Date: |
Tue, 12 May 2009 09:38:30 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-12 09:38:29 -0600 (Tue, 12 May 2009)
New Revision: 11009
Added:
gnuradio/branches/releases/3.2/debian/libmblock-dev.install
gnuradio/branches/releases/3.2/debian/libusrp2.dirs
gnuradio/branches/releases/3.2/debian/libusrp2.install
gnuradio/branches/releases/3.2/debian/libusrp2.limits
gnuradio/branches/releases/3.2/debian/libusrp2.postinst
gnuradio/branches/releases/3.2/debian/libusrp2.postrm
gnuradio/branches/releases/3.2/gr-usrp2/gnuradio-usrp2.pc.in
Modified:
gnuradio/branches/releases/3.2/
gnuradio/branches/releases/3.2/config/grc_gr_usrp2.m4
gnuradio/branches/releases/3.2/debian/
gnuradio/branches/releases/3.2/debian/changelog
gnuradio/branches/releases/3.2/debian/control
gnuradio/branches/releases/3.2/debian/gen-install-files.sh
gnuradio/branches/releases/3.2/debian/rules
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/
gnuradio/branches/releases/3.2/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
gnuradio/branches/releases/3.2/gr-usrp2/
gnuradio/branches/releases/3.2/gr-usrp2/Makefile.am
gnuradio/branches/releases/3.2/gr-usrp2/src/Makefile.am
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
gnuradio/branches/releases/3.2/grc/src/utils/odict.py
gnuradio/branches/releases/3.2/usrp/host/lib/legacy/Makefile.am
Log:
Applied changset r10981 to release 3.2 branch.
Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Modified: gnuradio/branches/releases/3.2/config/grc_gr_usrp2.m4
===================================================================
--- gnuradio/branches/releases/3.2/config/grc_gr_usrp2.m4 2009-05-12
15:37:07 UTC (rev 11008)
+++ gnuradio/branches/releases/3.2/config/grc_gr_usrp2.m4 2009-05-12
15:38:29 UTC (rev 11009)
@@ -26,6 +26,7 @@
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
+ gr-usrp2/gnuradio-usrp2.pc \
gr-usrp2/src/Makefile \
gr-usrp2/src/run_tests \
])
Property changes on: gnuradio/branches/releases/3.2/debian
___________________________________________________________________
Modified: svn:ignore
-
+ *.log
Modified: gnuradio/branches/releases/3.2/debian/changelog
===================================================================
--- gnuradio/branches/releases/3.2/debian/changelog 2009-05-12 15:37:07 UTC
(rev 11008)
+++ gnuradio/branches/releases/3.2/debian/changelog 2009-05-12 15:38:29 UTC
(rev 11009)
@@ -1,9 +1,9 @@
-gnuradio (3.1.svn) unstable; urgency=low
+gnuradio (3.2.svn) unstable; urgency=low
- * post release 3.1 trunk repository packages
+ * post release 3.2 trunk repository packages
* see http://gnuradio.org/trac/wiki for stable branch
- -- Johnathan Corgan <address@hidden> Mon, 24 Feb 2008 18:12:00 -0800
+ -- Johnathan Corgan <address@hidden> Mon, 4 May 2009 18:00:00 -0800
gnuradio (3.0.svn) unstable; urgency=low
Modified: gnuradio/branches/releases/3.2/debian/control
===================================================================
--- gnuradio/branches/releases/3.2/debian/control 2009-05-12 15:37:07 UTC
(rev 11008)
+++ gnuradio/branches/releases/3.2/debian/control 2009-05-12 15:38:29 UTC
(rev 11009)
@@ -1,3 +1,7 @@
+################################################################################
+# Single source deb for entire distribution
#
+################################################################################
+
Source: gnuradio
Section: comm
Priority: optional
@@ -3,12 +7,16 @@
Maintainer: Johnathan Corgan <address@hidden>
Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool,
pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev,
libboost1.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
+Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool,
pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev,
libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8,
python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev,
portaudio19-dev, libsdl1.2-dev, python-cheetah, python-gtk2, python-lxml
Standards-Version: 3.7.2
XS-Python-Version: >= 2.5
+################################################################################
+# C++ auxiliary libraries
#
+################################################################################
+
Package: libgruel
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: libboost-date-time1.37.0, libboost-thread1.37.0
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
@@ -18,7 +26,7 @@
Package: libgruel-dev
Section: libdevel
Architecture: any
-Depends: libgruel (= ${binary:Version}), libboost1.35-dev
+Depends: libgruel (= ${binary:Version}), libboost-date-time1.37-dev,
libboost-thread1.37-dev
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -30,7 +38,6 @@
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.
@@ -47,33 +54,12 @@
.
This package contains header files needed by developers.
-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}
+Depends: libgnuradio-omnithread (= ${binary:Version})
Description: GNU Radio Polymorphic Type Library
This package implements polymorphic types. These are similar
to lisp or Python data objects, and implement transparent
@@ -84,7 +70,7 @@
Architecture: any
Replaces: libpmt0-dev
Conflicts: libpmt0-dev
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev,
libboost1.35-dev
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev (=
${binary:Version})
Description: GNU Radio Polymorphic Type Library
This package implements polymorphic types. These are similar
to lisp or Python data objects, and implement transparent
@@ -92,12 +78,16 @@
.
This package contains header files needed by developers.
+################################################################################
+# C++ M-Block library packages
#
+################################################################################
+
Package: libmblock
Section: libs
Architecture: any
Replaces: libmblock0c2a
Conflicts: libmblock0c2a
-Depends: ${shlibs:Depends}
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version})
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
@@ -106,178 +96,20 @@
Architecture: any
Replaces: libmblock0-dev
Conflicts: libmblock0-dev
-Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev,
libpmt-dev
+Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev (=
${binary:Version}), libpmt-dev (= ${binary:Version})
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
.
This package contains header files needed by developers.
-Package: gnuradio-doc
-Section: doc
-Architecture: all
-Description: Software Defined Radio
- This package contains the documentation for the GNU Radio software
- defined radio system.
+################################################################################
+# C++ USRP/USRP2 library packages
#
+################################################################################
-Package: python-gnuradio-core
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
-Conflicts: python-gnuradio (< 3.1)
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: Python bindings for GNU Radio core library
- This package provides the modules that enable one to use gnuradio
- from Python scripts.
-
-Package: python-gnuradio-wxgui
-Architecture: any
-Depends: ${python:Depends}, python-gnuradio-core, python-wxgtk2.8,
python-opengl
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-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
-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 wrappers around the GNU Radio ALSA
- audio driver.
-
-Package: python-gnuradio-audio-jack
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Section: python
-Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python JACK Audio Driver
- This package provides the Python interface to the GNU Radio driver
- for the JACK audio system.
-
-Package: python-gnuradio-audio-oss
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Section: python
-Provides: ${python:Provides}, python-gnuradio-audio
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python OSS Audio Driver
- This package provides the Python interface to the GNU Radio driver
- for the OSS audio system.
-
-Package: python-gnuradio-audio-portaudio
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}, python-gnuradio-audio
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Python PortAudio Driver
- This package provides the Python interface to the GNU Radio driver
- for the PortAudio audio system.
-
-Package: python-gnuradio-atsc
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-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-cvsd-vocoder
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio CVSD Vocoder
- This package provides an implementation of a CVSD vocoder for
- GNU Radio.
-
-Package: python-gnuradio-gsm-fr-vocoder
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio GSM Full-Rate Vocoder
- This package provides an implementation of a full-rate GSM vocoder
- for GNU Radio.
-
-Package: python-gnuradio-trellis
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Trellis-Coded Modulation library
- This package provides an implementation of trellis-coded modulation
- for GNU Radio.
-
-Package: python-gnuradio-video-sdl
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio SDL Interface Library
- This package provides an interface to the SDL rendering library
- for GNU Radio.
-
-Package: python-gnuradio
-Section: python
-Architecture: all
-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-dev
-Section: libdevel
-Architecture: all
-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: libusrp
Section: comm
Architecture: any
+Depends: libusb-0.1-4
Replaces: libusrp0, libusrp0c2a, usrp-firmware
Suggests: usrp-doc
Description: Client side library for the USRP(1) hardware
@@ -309,127 +141,141 @@
.
This package contains header files needed by developers.
-Package: libusrp-inband
-Section: libs
+Package: libusrp2
+Section: comm
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.
+Depends: libboost-thread1.37.0, libgruel (= ${binary:Version}),
libgnuradio-omnithread (= ${binary:Version})
+Suggests: usrp-doc
+Description: Client side library for the USRP2 hardware
+ The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
+ low-cost and open board. It features two 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 client-side C++ library, providing the low-
+ level (non-GNU Radio) hardware interface.
-Package: libusrp-inband-dev
+Package: libusrp2-dev
Section: libdevel
Architecture: any
-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.
+Depends: libusrp2 (= ${binary:Version}), libboost1.37-dev,
libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (=
${binary:Version})
+Description: Client side library for the USRP(1) hardware
+ The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
+ low-cost and open board. It features two 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 client-side C++ library, providing the low-
+ level (non-GNU Radio) hardware interface.
+ .
This package contains header files needed by developers.
-Package: usrp-doc
-Section: doc
-Architecture: all
-Description: Software Defined Radio
- This package contains the documentation for the Universal Software Radio
- Peripheral (USRP) hardware and interface library.
+################################################################################
+# C++ GNU Radio block library packages
#
+################################################################################
-Package: python-usrp
+Package: libgnuradio-core
+Section: libs
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-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
- standalone device from Python, independent of GNU Radio proper.
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), libboost-thread1.37.0, libboost-date-time1.37.0,
libfftw3-3, libgsl0ldbl
+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: python-gnuradio-usrp
+Package: libgnuradio-core-dev
+Section: libdevel
+Architecture: any
+Replaces: libgnuradio-core0-dev
+Conflicts: libgnuradio-core0-dev
+Depends: libgnuradio-core (= ${binary:Version}), libgruel-dev (=
${binary:Version}), libgnuradio-omnithread-dev (= ${binary:Version}),
libboost-thread1.37-dev, libboost-date-time1.37-dev, libgsl0-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: libgnuradio-audio-alsa
+Section: libs
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core,
python-usrp
-Provides: ${python:Provides}
-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
- driver and daughterboard drivers.
+Depends: libgnuradio-core (= ${binary:Version}), libasound2
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
-Package: gnuradio-utils
+Package: libgnuradio-audio-alsa-dev
+Section: libdevel
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp,
python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy
-Provides: ${python:Provides}
-Section: comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Utilities
- This package provides commonly used utilities for GNU Radio
+Depends: libgnuradio-audio-alsa (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libasound2-dev
+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: usrp
-Section: comm
-Architecture: all
-Depends: usrp-doc, libusrp
-Description: The Universal Software Radio Peripheral
- This is a virtual package that depends on the non-GNU Radio USRP
- software collection.
-
-Package: gnuradio-examples
+Package: libgnuradio-qtgui
+Section: libs
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
+Depends: libgnuradio-core (= ${binary:Version}), libqt4-opengl, libqtcore4,
libqtgui4, libqwt5-qt4, libqwtplot3d-qt4
+Description: GNU Radio C++ blocks fro QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
-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
+Package: libgnuradio-qtgui-dev
+Section: libdevel
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
-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
+Depends: libgnuradio-qtgui (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev
+Description: GNU Radio C++ blocks fro QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
+ .
+ This package contains header files needed by developers.
-Package: gnuradio-sounder
+Package: libgnuradio-usrp
+Section: libs
Architecture: any
-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
+Depends: libgnuradio-core (= ${binary:Version}), libusrp (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
-Package: gnuradio-gpio
+Package: libgnuradio-usrp-dev
+Section: libdevel
Architecture: any
-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
+Depends: libgnuradio-usrp (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libusrp-dev (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+ .
+ This package contains header files needed by developers.
-Package: gnuradio-radar-mono
+Package: libgnuradio-usrp2
+Section: libs
Architecture: any
-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
+Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
-Package: gnuradio-radio-astronomy
+Package: libgnuradio-usrp2-dev
+Section: libdevel
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp,
python-gnuradio-wxgui
-Section: comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Radio Astronomy Applications
- This package provides radio astronomy applications for GNU Radio
+Depends: libgnuradio-usrp2 (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libusrp2-dev (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+ .
+ This package contains header files needed by developers.
+
+################################################################################
+# Documentation packages
#
+################################################################################
+
+Package: gnuradio-doc
+Section: doc
+Architecture: all
+Description: Software Defined Radio
+ This package contains the documentation for the GNU Radio software
+ defined radio system.
Modified: gnuradio/branches/releases/3.2/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/releases/3.2/debian/gen-install-files.sh 2009-05-12
15:37:07 UTC (rev 11008)
+++ gnuradio/branches/releases/3.2/debian/gen-install-files.sh 2009-05-12
15:38:29 UTC (rev 11009)
@@ -2,6 +2,23 @@
EXTRACT=dtools/bin/extract_install_filenames
+# 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
+
+# libusrp2-dev
+NAME=debian/libusrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp2/host/include/usrp2/Makefile usrp2include_HEADERS >>$NAME
+echo usr/lib/libusrp2.so >>$NAME
+echo usr/lib/pkgconfig/usrp2.pc >>$NAME
+
# libgnuradio-core-dev
NAME=debian/libgnuradio-core-dev.install
rm -f $NAME
@@ -18,20 +35,79 @@
$EXTRACT gnuradio-core/src/lib/reed-solomon/Makefile swiginclude_HEADERS
>>$NAME
$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/hier/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/hier/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
-# libmblock-dev
-NAME=debian/libmblock-dev.install
+# libgnuradio-audio-alsa
+NAME=debian/libgnuradio-audio-alsa.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
+$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
+
+# libgnuradio-qtgui
+NAME=debian/libgnuradio-qtgui.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-qtgui-dev
+NAME=debian/libgnuradio-qtgui-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-qtgui.so >>$NAME
+
+# libgnuradio-usrp
+NAME=debian/libgnuradio-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp.pc >> $NAME
+
+# libgnuradio-usrp-dev
+NAME=debian/libgnuradio-usrp-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp.so >>$NAME
+
+# libgnuradio-usrp2
+NAME=debian/libgnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp2.pc >> $NAME
+
+# libgnuradio-usrp2-dev
+NAME=debian/libgnuradio-usrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp2.so >>$NAME
+
+exit 0
+
# python-gnuradio-core
NAME=debian/python-gnuradio-core.install
rm -f $NAME
@@ -48,15 +124,6 @@
$EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON
>>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile
grvocoderpython_PYTHON >>$NAME
-# 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-inband-dev
NAME=debian/libusrp-inband-dev.install
rm -f $NAME
@@ -104,23 +171,6 @@
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
Copied: gnuradio/branches/releases/3.2/debian/libmblock-dev.install (from rev
10981, gnuradio/trunk/debian/libmblock-dev.install)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libmblock-dev.install
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libmblock-dev.install 2009-05-12
15:38:29 UTC (rev 11009)
@@ -0,0 +1,3 @@
+usr/include/mblock/*
+usr/lib/libmblock.so
+usr/lib/pkgconfig/mblock.pc
Copied: gnuradio/branches/releases/3.2/debian/libusrp2.dirs (from rev 10981,
gnuradio/trunk/debian/libusrp2.dirs)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.dirs
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.dirs 2009-05-12 15:38:29 UTC
(rev 11009)
@@ -0,0 +1,2 @@
+etc/security/limits.d
+
Copied: gnuradio/branches/releases/3.2/debian/libusrp2.install (from rev 10981,
gnuradio/trunk/debian/libusrp2.install)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.install
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.install 2009-05-12
15:38:29 UTC (rev 11009)
@@ -0,0 +1,5 @@
+usr/lib/libusrp2.la
+usr/lib/libusrp2.so.*
+usr/bin/usrp2_socket_opener
+usr/bin/find_usrps
+etc/security/limits.d/libusrp2.limits
Copied: gnuradio/branches/releases/3.2/debian/libusrp2.limits (from rev 10981,
gnuradio/trunk/debian/libusrp2.limits)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.limits
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.limits 2009-05-12
15:38:29 UTC (rev 11009)
@@ -0,0 +1 @@
address@hidden - rtprio 50
Copied: gnuradio/branches/releases/3.2/debian/libusrp2.postinst (from rev
10981, gnuradio/trunk/debian/libusrp2.postinst)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.postinst
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.postinst 2009-05-12
15:38:29 UTC (rev 11009)
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+ exit 0
+fi
+
+# Create usrp group for access
+if ! getent group usrp >/dev/null; then
+ addgroup --system usrp
+fi
+
+# Create setuid root for group usrp on socket opener
+chown root.usrp /usr/bin/usrp2_socket_opener
+chmod 04750 /usr/bin/usrp2_socket_opener
+
+exit 0
Copied: gnuradio/branches/releases/3.2/debian/libusrp2.postrm (from rev 10981,
gnuradio/trunk/debian/libusrp2.postrm)
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.postrm
(rev 0)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.postrm 2009-05-12
15:38:29 UTC (rev 11009)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "remove" ]; then
+ exit 0
+fi
+
+rm -f /etc/security/limits.d/libusrp2.limits
+
+exit 0
Modified: gnuradio/branches/releases/3.2/debian/rules
===================================================================
--- gnuradio/branches/releases/3.2/debian/rules 2009-05-12 15:37:07 UTC (rev
11008)
+++ gnuradio/branches/releases/3.2/debian/rules 2009-05-12 15:38:29 UTC (rev
11009)
@@ -48,7 +48,7 @@
--enable-doxygen --enable-html-docs \
--sysconfdir=/etc --enable-all-components \
--disable-gr-audio-osx --disable-gr-audio-windows \
- --disable-gr-qtgui --disable-gcell --disable-gr-gcell \
+ --disable-gcell --disable-gr-gcell \
--disable-gr-comedi --disable-usrp2-firmware
touch configure-stamp
@@ -61,7 +61,7 @@
build: build-stamp
build-stamp: extract-stamp
- $(MAKE)
+ $(MAKE) -j
$(MAKE) check
touch $@
@@ -85,6 +85,10 @@
install -m 0644 -D debian/libusrp.udev \
debian/tmp/etc/udev/rules.d/40-usrp.rules
+ : # Deposit rule to allow group 'usrp' access to USRP2 hardware
+ install -m 0644 -D debian/libusrp2.limits \
+ debian/tmp/etc/security/limits.d/libusrp2.limits
+
dh_install --sourcedir=debian/tmp
touch $@
@@ -107,7 +111,7 @@
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb --destdir=../debfiles
# Build architecture independant packages using the common target.
binary-indep: build install
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/trunk/gnuradio-examples/python/digital:10942,10972,10975,10979
+
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/trunk/gnuradio-examples/python/digital:10942,10972,10975,10979,10981
Modified: gnuradio/branches/releases/3.2/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-qtgui/src/lib/Makefile.am 2009-05-12
15:37:07 UTC (rev 11008)
+++ gnuradio/branches/releases/3.2/gr-qtgui/src/lib/Makefile.am 2009-05-12
15:38:29 UTC (rev 11009)
@@ -40,10 +40,10 @@
EXTRA_DIST = spectrumdisplayform.ui
# Build the normal library for C++ apps to link against
-lib_LTLIBRARIES = libqtgui.la
+lib_LTLIBRARIES = libgnuradio-qtgui.la
# These are the source files that go into the shared library
-libqtgui_la_SOURCES = \
+libgnuradio_qtgui_la_SOURCES = \
FrequencyDisplayPlot.cc \
TimeDomainDisplayPlot.cc \
WaterfallDisplayPlot.cc \
@@ -90,9 +90,9 @@
endif
# magic flags
-libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-libqtgui_la_LIBADD = \
+libgnuradio_qtgui_la_LIBADD = \
$(GNURADIO_CORE_LA) \
-lstdc++ \
$(QT_LIBS)
@@ -112,7 +112,7 @@
# additional libraries for linking with the SWIG-generated library
qtgui_la_swig_libadd = \
- libqtgui.la
+ libgnuradio-qtgui.la
include $(top_srcdir)/Makefile.swig
Property changes on:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on: gnuradio/branches/releases/3.2/gr-usrp2
___________________________________________________________________
Modified: svn:ignore
- .libs
.deps
Makefile
Makefile.in
*.pyc
usrp2.cc
usrp2.py
test_gr_usrp2
+ Makefile
Makefile.in
gnuradio-usrp2.pc
Modified: gnuradio/branches/releases/3.2/gr-usrp2/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp2/Makefile.am 2009-05-12 15:37:07 UTC
(rev 11008)
+++ gnuradio/branches/releases/3.2/gr-usrp2/Makefile.am 2009-05-12 15:38:29 UTC
(rev 11009)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnuradio-usrp2.pc
Copied: gnuradio/branches/releases/3.2/gr-usrp2/gnuradio-usrp2.pc.in (from rev
10981, gnuradio/trunk/gr-usrp2/gnuradio-usrp2.pc.in)
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp2/gnuradio-usrp2.pc.in
(rev 0)
+++ gnuradio/branches/releases/3.2/gr-usrp2/gnuradio-usrp2.pc.in
2009-05-12 15:38:29 UTC (rev 11009)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@/gnuradio
+
+Name: gnuradio-usrp2
+Description: GNU Software Radio support for Universal Software Radio
Peripheral 2
+Requires: gnuradio-core usrp2
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-usrp2
+Cflags: -I${includedir}
Modified: gnuradio/branches/releases/3.2/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gr-usrp2/src/Makefile.am 2009-05-12
15:37:07 UTC (rev 11008)
+++ gnuradio/branches/releases/3.2/gr-usrp2/src/Makefile.am 2009-05-12
15:38:29 UTC (rev 11009)
@@ -49,9 +49,9 @@
$(USRP2_INCLUDES) \
$(WITH_INCLUDES)
-lib_LTLIBRARIES = libgr-usrp2.la
+lib_LTLIBRARIES = libgnuradio-usrp2.la
-libgr_usrp2_la_SOURCES = \
+libgnuradio_usrp2_la_SOURCES = \
rx_16sc_handler.cc \
rx_32fc_handler.cc \
usrp2_base.cc \
@@ -62,7 +62,7 @@
usrp2_sink_16sc.cc \
usrp2_sink_32fc.cc
-libgr_usrp2_la_LIBADD = \
+libgnuradio_usrp2_la_LIBADD = \
$(USRP2_LA) \
$(GNURADIO_CORE_LA)
@@ -102,7 +102,7 @@
# additional libraries for linking with the SWIG-generated library
usrp2_la_swig_libadd = \
- libgr-usrp2.la
+ libgnuradio-usrp2.la
include $(top_srcdir)/Makefile.swig
Property changes on:
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980,10992,10998-10999
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-10999
Property changes on:
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980
+
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio/wxgui/forms/forms.py:10949-10959
/gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981
Property changes on: gnuradio/branches/releases/3.2/grc/src/utils/odict.py
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/trunk/grc/src/utils/odict.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10980
+ /gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959
/gnuradio/trunk/grc/src/utils/odict.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981
Modified: gnuradio/branches/releases/3.2/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp/host/lib/legacy/Makefile.am
2009-05-12 15:37:07 UTC (rev 11008)
+++ gnuradio/branches/releases/3.2/usrp/host/lib/legacy/Makefile.am
2009-05-12 15:38:29 UTC (rev 11009)
@@ -143,6 +143,15 @@
include_HEADERS = \
db_base.h \
+ db_basic.h \
+ db_dbs_rx.h \
+ db_dtt754.h \
+ db_dtt768.h \
+ db_flexrf.h \
+ db_flexrf_mimo.h \
+ db_tv_rx.h \
+ db_util.h \
+ db_xcvr2450.h \
usrp_basic.h \
usrp_bytesex.h \
usrp_config.h \
@@ -156,17 +165,8 @@
noinst_HEADERS = \
ad9862.h \
db_base_impl.h \
- db_basic.h \
db_boards.h \
- db_dbs_rx.h \
- db_dtt754.h \
- db_dtt768.h \
- db_flexrf.h \
- db_flexrf_mimo.h \
- db_tv_rx.h \
- db_util.h \
db_wbx.h \
- db_xcvr2450.h \
fusb.h \
fusb_darwin.h \
fusb_generic.h \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11009 - in gnuradio/branches/releases/3.2: . config debian gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/lib gr-qtgui/src/python gr-usrp2 gr-usrp2/src gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp/host/lib/legacy,
jcorgan <=