[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11096 - in gnuradio/branches/releases/3.2: . debian d
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11096 - in gnuradio/branches/releases/3.2: . debian dtools/bin gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/apps/hf_radio gnuradio-examples/python/digital gnuradio-examples/python/digital-bert gnuradio-examples/python/mp-sched gnuradio-examples/python/ofdm gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp2/firmware usrp2/host/lib |
|
Date: |
Sat, 23 May 2009 12:39:47 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-23 12:39:47 -0600 (Sat, 23 May 2009)
New Revision: 11096
Modified:
gnuradio/branches/releases/3.2/
gnuradio/branches/releases/3.2/debian/build-bin.sh
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/libusrp.postinst
gnuradio/branches/releases/3.2/debian/libusrp.postrm
gnuradio/branches/releases/3.2/debian/libusrp2.postinst
gnuradio/branches/releases/3.2/debian/libusrp2.postrm
gnuradio/branches/releases/3.2/debian/pyversions
gnuradio/branches/releases/3.2/debian/rules
gnuradio/branches/releases/3.2/dtools/bin/extract_install_filenames
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/apps/hf_radio/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/transmit_path.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-examples/python/mp-sched/Makefile.am
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/Makefile.am
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
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/usrp2/firmware/configure.gnu
gnuradio/branches/releases/3.2/usrp2/host/lib/Makefile.am
Log:
Applied changesets r11043, r11072, r11078, r11079:11082, and r11086 to release
3.2 release branch.
Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Modified: gnuradio/branches/releases/3.2/debian/build-bin.sh
===================================================================
--- gnuradio/branches/releases/3.2/debian/build-bin.sh 2009-05-23 18:31:02 UTC
(rev 11095)
+++ gnuradio/branches/releases/3.2/debian/build-bin.sh 2009-05-23 18:39:47 UTC
(rev 11096)
@@ -8,5 +8,3 @@
--svn-reuse \
-nc \
-rfakeroot
-
-
Modified: gnuradio/branches/releases/3.2/debian/changelog
===================================================================
--- gnuradio/branches/releases/3.2/debian/changelog 2009-05-23 18:31:02 UTC
(rev 11095)
+++ gnuradio/branches/releases/3.2/debian/changelog 2009-05-23 18:39:47 UTC
(rev 11096)
@@ -3,7 +3,7 @@
* post release 3.2 trunk repository packages
* see http://gnuradio.org/trac/wiki for stable branch
- -- Johnathan Corgan <address@hidden> Mon, 4 May 2009 18:00:00 -0800
+ -- Johnathan Corgan <address@hidden> Wed, 20 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-23 18:31:02 UTC
(rev 11095)
+++ gnuradio/branches/releases/3.2/debian/control 2009-05-23 18:39:47 UTC
(rev 11096)
@@ -7,9 +7,9 @@
Priority: optional
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.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
+Build-Depends: debhelper (>= 5.0.38), build-essential, python-central
(>=0.5.6), automake, libtool, pkg-config, python-dev (>=2.6), python-dev
(<2.7), swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-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-lxml, python-gtk2,
libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev
Standards-Version: 3.7.2
-XS-Python-Version: >= 2.5
+XS-Python-Version: =2.6
################################################################################
# C++ auxiliary libraries
#
@@ -18,7 +18,7 @@
Package: libgruel
Section: libs
Architecture: any
-Depends: libboost-date-time1.37.0, libboost-thread1.37.0
+Depends: ${shlibs:Depends}
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -26,7 +26,7 @@
Package: libgruel-dev
Section: libdevel
Architecture: any
-Depends: libgruel (= ${binary:Version}), libboost-date-time1.37-dev,
libboost-thread1.37-dev
+Depends: libgruel (= ${binary:Version})
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -38,6 +38,7 @@
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.
@@ -59,7 +60,7 @@
Architecture: any
Replaces: libpmt0c2a
Conflicts: libpmt0c2a
-Depends: libgnuradio-omnithread (= ${binary:Version})
+Depends: libgnuradio-omnithread (= ${binary:Version}), ${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
@@ -87,7 +88,7 @@
Architecture: any
Replaces: libmblock0c2a
Conflicts: libmblock0c2a
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version})
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), ${shlibs:Depends}, guile-1.8
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
@@ -109,8 +110,9 @@
Package: libusrp
Section: comm
Architecture: any
-Depends: libusb-0.1-4
+Depends: ${shlibs:Depends}
Replaces: libusrp0, libusrp0c2a, usrp-firmware
+Conflicts: usrp-firmware
Suggests: usrp-doc
Description: Client side library for the USRP(1) hardware
The Universal Software Radio Peripheral (USRP) is an USB-connected,
@@ -127,7 +129,7 @@
Section: libdevel
Architecture: any
Replaces: libusrp0-dev
-Depends: libusrp (= ${binary:Version}), libusb-dev
+Depends: libusrp (= ${binary:Version}), libusb-dev, libboost-thread1.37-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
@@ -144,7 +146,7 @@
Package: libusrp2
Section: comm
Architecture: any
-Depends: libboost-thread1.37.0, libgruel (= ${binary:Version}),
libgnuradio-omnithread (= ${binary:Version})
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), ${shlibs:Depends}
Suggests: usrp-doc
Description: Client side library for the USRP2 hardware
The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
@@ -160,8 +162,8 @@
Package: libusrp2-dev
Section: libdevel
Architecture: any
-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
+Depends: libusrp2 (= ${binary:Version}), libboost-thread1.37-dev,
libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (=
${binary:Version})
+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
@@ -181,7 +183,7 @@
Package: libgnuradio-core
Section: libs
Architecture: any
-Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), libboost-thread1.37.0, libboost-date-time1.37.0,
libfftw3-3, libgsl0ldbl
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), ${shlibs:Depends}
Conflicts: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
Replaces: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
Suggests: gnuradio-doc
@@ -193,7 +195,7 @@
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
+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,
swig
Description: The GNU Software Radio Core Library
This package contains the core GNU Radio libraries.
.
@@ -202,7 +204,7 @@
Package: libgnuradio-audio-alsa
Section: libs
Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libasound2
+Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends}
Description: GNU Radio C++ block for ALSA sound system
This package contains the ALSA sound system driver for GNU Radio.
@@ -218,7 +220,7 @@
Package: libgnuradio-qtgui
Section: libs
Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libqt4-opengl, libqtcore4,
libqtgui4, libqwt5-qt4, libqwtplot3d-qt4
+Depends: libgnuradio-core (= ${binary:Version}), ${shlibs:Depends}
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.
@@ -236,7 +238,7 @@
Package: libgnuradio-usrp
Section: libs
Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libusrp (= ${binary:Version})
+Depends: libgnuradio-core (= ${binary:Version}), libusrp (=
${binary:Version}), ${shlibs:Depends}
Description: GNU Radio C++ blocks for USRP(1) hardware
This package contains the C++ API blocks for the Universal Software Radio
Peripheral.
@@ -254,7 +256,7 @@
Package: libgnuradio-usrp2
Section: libs
Architecture: any
-Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= ${binary:Version})
+Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (=
${binary:Version}), ${shlibs:Depends}
Description: GNU Radio C++ blocks for USRP(1) hardware
This package contains the C++ API blocks for the Universal Software Radio
Peripheral.
@@ -270,6 +272,239 @@
This package contains header files needed by developers.
################################################################################
+# Python libraries for USRP
#
+################################################################################
+
+Package: python-usrp
+Architecture: any
+Depends: ${python:Depends}, libusrp (= ${binary:Version}), ${shlibs:Depends}
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for the USRP library
+ This package provides auxiliary routines in Python for manipulating the USRP
+ hardware.
+
+################################################################################
+# Python libraries for GNU Radio components
#
+################################################################################
+
+Package: python-gnuradio-core
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy
+Conflicts: python-gnuradio (< 3.2)
+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 (= ${binary:Version}),
python-wxgtk2.8, python-opengl, python-numpy
+Conflicts: python-wxgtk2.6
+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: python-gnuradio-usrp
+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.
+
+Package: python-gnuradio-usrp2
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+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.
+
+Package: python-gnuradio-audio-alsa
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (=
${binary:Version}), 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-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-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-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-qtgui
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (=
${binary:Version}), python-gnuradio-core
+Section: python
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for GNU Radio ALSA audio driver
+ This package provides the Python wrappers around the GNU Radio QT
+ GUI C++ blocks.
+
+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.
+
+################################################################################
+# GNU Radio Utilities, Examples, and Applications
#
+################################################################################
+
+Package: gnuradio-utils
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp,
python-gnuradio-usrp2, 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
+
+Package: gnuradio-examples
+Architecture: any
+Depends: ${python:Depends}, python-gnuradio-core
+Provides: ${python:Provides}
+Recommends: python-gnuradio-wxgui, python-gnuradio
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Example Programs
+ This package provides examples of GNU Radio usage using Python.
+
+Package: gnuradio-pager
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
+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
+Architecture: any
+Replaces: gnuradio-sounder-firmware
+Conflicts: gnuradio-sounder-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
+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
+Architecture: any
+Replaces: gnuradio-gpio-firmware
+Conflicts: gnuradio-gpio-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Streaming Digital Application
+ This package provides streaming digital GPIO capabilities for GNU Radio
+
+Package: gnuradio-radar-mono
+Architecture: any
+Replaces: gnuradio-radar-mono-firmware
+Conflicts: gnuradio-radar-mono-firmware
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Monostatic Radar Application
+ This package provides a monostatic radar application for GNU Radio
+
+Package: gnuradio-radio-astronomy
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp,
python-gnuradio-wxgui
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Radio Astronomy Applications
+ This package provides radio astronomy applications for GNU Radio
+
+Package: grc
+Architecture: any
+Depends: ${python:Depends}, gnuradio, gnuradio-doc, usrp-doc, python-lxml,
python-cheetah, python-gtk2
+Provides: ${python:Provides}
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: The GNU Radio Companion
+ GRC is a graphical flowgraph editor for the GNU Software Radio
+
+################################################################################
# Documentation packages
#
################################################################################
@@ -279,3 +514,63 @@
Description: Software Defined Radio
This package contains the documentation for the GNU Radio software
defined radio system.
+
+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.
+
+################################################################################
+# Meta-packages
#
+################################################################################
+
+Package: libgnuradio
+Section: libs
+Architecture: all
+Depends: libgnuradio-core (= ${binary:Version}),
+Recommends: libgnuradio-audio-alsa, libgnuradio-qtqui, libgnuradio-usrp,
libgnuradio-usrp2
+Description: GNU Radio C++ API libraries
+ This is a virtual package that depends, recommends, or suggests all of the
+ binary packages that make up the GNU Radio C++ API. For development headers,
+ install libgnuradio-dev.
+
+Package: libgnuradio-dev
+Section: libdevel
+Architecture: all
+Depends: libgnuradio (= ${binary:Version}), libgnuradio-core-dev
+Recommends: libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev,
libgnuradio-usrp-dev, libgnuradio-usrp2-dev,
+Suggests: gnuradio-doc, usrp-doc
+Replaces: gnuradio-dev
+Description: Development headers for GNU Radio C++ development
+ This is a virtual package that depends or recommends the development header
+ packages for the GNU Radio C++ API. It is only needed if you intend
+ to develop custom GNU Radio signal processing blocks in C++.
+
+Package: python-gnuradio
+Section: python
+Architecture: all
+Depends: python-gnuradio-core
+Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa |
python-gnuradio-audio, python-gnuradio-cvsd-vocoder,
python-gnuradio-gsm-fr-vocoder, python-gnuradio-qtgui, python-gnuradio-trellis,
python-gnuradio-video-sdl, python-gnuradio-usrp, python-gnuradio-usrp2
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python Libraries for GNU Radio Components
+ This is a virtual package that depends or recommends all of the packages that
+ make up the GNU Radio Python API.
+
+Package: gnuradio-apps
+Section: comm
+Architecture: all
+Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder,
gnuradio-radio-astronomy, gnuradio-radar-mono
+Description: The GNU Software Radio Toolkit - applications
+ This is a virtual package that depends on top-level GNU Radio application
+ packages.
+
+Package: gnuradio
+Section: comm
+Architecture: all
+Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio,
gnuradio-utils, gnuradio-examples, gnuradio-apps
+Description: The GNU Software Radio Toolkit
+ This is a virtual package that installs the entire GNU Radio and USRP software
+ set.
Modified: gnuradio/branches/releases/3.2/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/releases/3.2/debian/gen-install-files.sh 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/debian/gen-install-files.sh 2009-05-23
18:39:47 UTC (rev 11096)
@@ -106,50 +106,52 @@
$EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME
echo usr/lib/libgnuradio-usrp2.so >>$NAME
-exit 0
+# python-usrp
+NAME=debian/python-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_python_PYTHON >>$NAME
+$EXTRACT usrp/host/lib/legacy/Makefile usrppython_PYTHON >>$NAME
# python-gnuradio-core
NAME=debian/python-gnuradio-core.install
rm -f $NAME
touch $NAME
$EXTRACT gnuradio-core/src/python/gnuradio/Makefile grpython_PYTHON >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrlib_LTLIBRARIES >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrlib_LTLIBRARIES | \
- sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT gnuradio-core/src/lib/swig/Makefile grgrpython_PYTHON >>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/gr/Makefile grgrpython_PYTHON
>>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/blks2/Makefile grblks2python_PYTHON
>>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/blks2impl/Makefile
grblkspython_PYTHON >>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON
>>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON
>>$NAME
$EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile
grvocoderpython_PYTHON >>$NAME
-
-# 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
-rm -f $NAME
-touch $NAME
-$EXTRACT usrp/host/swig/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT usrp/host/swig/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_filter_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_general_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_gengen_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_hier_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_io_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_runtime_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_filter_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT usrp/host/lib/legacy/Makefile usrppython_PYTHON >>$NAME
-$EXTRACT usrp/host/swig/Makefile ourpython_PYTHON >>$NAME
-
-# python-gnuradio-usrp
-NAME=debian/python-gnuradio-usrp.install
-rm -f $NAME
-touch $NAME
-$EXTRACT gr-usrp/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-usrp/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-usrp/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_general_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_gengen_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_hier_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_io_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_runtime_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_filter_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_general_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_gengen_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_hier_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_python_PYTHON
>>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile
gnuradio_swig_py_runtime_python_PYTHON >>$NAME
# python-gnuradio-wxgui
NAME=debian/python-gnuradio-wxgui.install
@@ -160,109 +162,111 @@
$EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME
$EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME
-# python-gnuradio-atsc
-NAME=debian/python-gnuradio-atsc.install
+# python-gnuradio-usrp
+NAME=debian/python-gnuradio-usrp.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-atsc/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-atsc/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-atsc/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-atsc/src/lib/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-usrp/src/Makefile usrp_swig_python_PYTHON >>$NAME
+$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT gr-atsc/src/python/Makefile ourdata_DATA >>$NAME
+# python-gnuradio-usrp2
+NAME=debian/python-gnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_python_PYTHON >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so/' >>$NAME
+
# python-gnuradio-audio-alsa
NAME=debian/python-gnuradio-audio-alsa.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-audio-alsa/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-audio-alsa/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_python_PYTHON >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_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
echo etc/gnuradio/conf.d/gr-audio-jack.conf >>$NAME
-$EXTRACT gr-audio-jack/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-audio-jack/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-audio-jack/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_python_PYTHON >>$NAME
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
# python-gnuradio-audio-oss
-# TODO: break out libgnuradio-audio-oss
NAME=debian/python-gnuradio-audio-oss.install
rm -f $NAME
touch $NAME
echo etc/gnuradio/conf.d/gr-audio-oss.conf >>$NAME
-$EXTRACT gr-audio-oss/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-audio-oss/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-audio-oss/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_python_PYTHON >>$NAME
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
# python-gnuradio-audio-portaudio
-# TODO: break out libgnuradio-audio-portaudio
NAME=debian/python-gnuradio-audio-portaudio.install
rm -f $NAME
touch $NAME
echo etc/gnuradio/conf.d/gr-audio-portaudio.conf >>$NAME
-$EXTRACT gr-audio-portaudio/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-audio-portaudio/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-audio-portaudio/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_python_PYTHON >>$NAME
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES
>>$NAME
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
-# python-gnuradio-comedi
-#NAME=debian/python-gnuradio-comedi.install
-#rm -f $NAME
-#touch $NAME
-#$EXTRACT gr-comedi/src/Makefile ourpython_PYTHON >>$NAME
-#$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES >>$NAME
-#$EXTRACT gr-comedi/src/Makefile ourlib_LTLIBRARIES | \
-# sed -e 's/\.la$/.so/' >>$NAME
-
# python-gnuradio-cvsd-vocoder
-# TODO: break out libgnuradio-cvsd-vocoder
NAME=debian/python-gnuradio-cvsd-vocoder.install
rm -f $NAME
touch $NAME
$EXTRACT gr-cvsd-vocoder/src/python/Makefile grblkspython_PYTHON >>$NAME
-$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-cvsd-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_python_PYTHON >>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES
>>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
# python-gnuradio-gsm-fr-vocoder
-# TODO: break out libgnuradio-gsm-fr-vocoder
NAME=debian/python-gnuradio-gsm-fr-vocoder.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_python_PYTHON >>$NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES
>>$NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
+# python-gnuradio-qtgui
+NAME=debian/python-gnuradio-qtgui.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/python/Makefile qtguipython_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_python_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so*/' >>$NAME
+
# python-gnuradio-trellis
-# TODO: break out libgnuradio-trellis
NAME=debian/python-gnuradio-trellis.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-trellis/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-trellis/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-trellis/src/lib/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-trellis/src/lib/Makefile trellis_python_PYTHON >>$NAME
+$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT gr-trellis/src/examples/Makefile ourdata_DATA >>$NAME
-$EXTRACT gr-trellis/src/examples/fsm_files/Makefile ourdata_DATA >>$NAME
+$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gr-trellis/src/examples/fsm_files/Makefile dist_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
-$EXTRACT gr-video-sdl/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-video-sdl/src/Makefile ourlib_LTLIBRARIES | \
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_python_PYTHON >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
# gnuradio-utils
@@ -276,41 +280,63 @@
NAME=debian/gnuradio-examples.install
rm -f $NAME
touch $NAME
-$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile ourdata_DATA
>>$NAME
-$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/audio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/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
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_DATA
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile
dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_DATA
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/audio/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_DATA
>>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/digital_voice/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/multi-antenna/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_SCRIPTS
>>$NAME
+$EXTRACT gnuradio-examples/python/network/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/usrp/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_SCRIPTS >>$NAME
+# gnuradio-pager
+NAME=debian/gnuradio-pager.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-pager/src/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_python_PYTHON >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES |
+ sed -e 's/\.la$/.so/' >>$NAME
+
+# gnuradio-sounder
+NAME=debian/gnuradio-sounder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-sounder/src/python/Makefile sounder_python_PYTHON >>$NAME
+$EXTRACT gr-sounder/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_sounder.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_sounder.rbf >>$NAME
+
# gnuradio-gpio
NAME=debian/gnuradio-gpio.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-gpio/src/python/Makefile bin_SCRIPTS >>$NAME
+$EXTRACT gr-gpio/src/python/Makefile dist_bin_SCRIPTS >>$NAME
$EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-gpio/src/lib/Makefile ourlib_LTLIBRARIES |
- sed -e 's/\.la$/.so/' >>$NAME
echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME
echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME
-# gnuradio-pager
-NAME=debian/gnuradio-pager.install
+# gnuradio-radar-mono
+NAME=debian/gnuradio-radar-mono.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-pager/src/Makefile bin_SCRIPTS >>$NAME
-$EXTRACT gr-pager/src/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-pager/src/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-pager/src/Makefile ourlib_LTLIBRARIES |
- sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gr-radar-mono/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-radar-mono/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME
# gnuradio-radio-astronomy
NAME=debian/gnuradio-radio-astronomy.install
@@ -318,26 +344,37 @@
touch $NAME
$EXTRACT gr-radio-astronomy/src/python/Makefile ourpython_PYTHON >>$NAME
$EXTRACT gr-radio-astronomy/src/python/Makefile wxguipython_PYTHON >>$NAME
-$EXTRACT gr-radio-astronomy/src/python/Makefile bin_SCRIPTS >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourlib_LTLIBRARIES >>$NAME
-$EXTRACT gr-radio-astronomy/src/lib/Makefile ourlib_LTLIBRARIES |
+$EXTRACT gr-radio-astronomy/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_python_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES |
sed -e 's/\.la$/.so/' >>$NAME
-# gnuradio-radar-mono
-NAME=debian/gnuradio-radar-mono.install
+# grc
+NAME=debian/grc.install
rm -f $NAME
touch $NAME
-$EXTRACT gr-radar-mono/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-radar-mono/src/python/Makefile bin_SCRIPTS >>$NAME
-echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
-echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME
-
-# gnuradio-sounder
-NAME=debian/gnuradio-sounder.install
-rm -f $NAME
-touch $NAME
-$EXTRACT gr-sounder/src/python/Makefile ourpython_PYTHON >>$NAME
-$EXTRACT gr-sounder/src/python/Makefile bin_SCRIPTS >>$NAME
-echo usr/share/usrp/rev2/usrp_sounder.rbf
-echo usr/share/usrp/rev4/usrp_sounder.rbf
+$EXTRACT grc/data/platforms/base/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/data/platforms/python/blocks/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_audiodata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_simpledata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_trellisdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_usrpdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_xmlrpcdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/scripts/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/src/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/blks2/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/usrp/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/grc_gnuradio/wxgui/Makefile oursubpython_PYTHON >>$NAME
+$EXTRACT grc/src/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/base/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/platforms/python/utils/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/src/utils/Makefile ourpython_PYTHON >>$NAME
Modified: gnuradio/branches/releases/3.2/debian/libusrp.postinst
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp.postinst 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/debian/libusrp.postinst 2009-05-23
18:39:47 UTC (rev 11096)
@@ -11,4 +11,5 @@
addgroup --system usrp
fi
+ldconfig
exit 0
Modified: gnuradio/branches/releases/3.2/debian/libusrp.postrm
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp.postrm 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/debian/libusrp.postrm 2009-05-23
18:39:47 UTC (rev 11096)
@@ -6,6 +6,5 @@
exit 0
fi
-rm -f /etc/udev/rules.d/40-usrp.rules
-
+/sbin/ldconfig
exit 0
Modified: gnuradio/branches/releases/3.2/debian/libusrp2.postinst
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.postinst 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.postinst 2009-05-23
18:39:47 UTC (rev 11096)
@@ -14,5 +14,5 @@
# Create setuid root for group usrp on socket opener
chown root.usrp /usr/bin/usrp2_socket_opener
chmod 04750 /usr/bin/usrp2_socket_opener
-
+ldconfig
exit 0
Modified: gnuradio/branches/releases/3.2/debian/libusrp2.postrm
===================================================================
--- gnuradio/branches/releases/3.2/debian/libusrp2.postrm 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/debian/libusrp2.postrm 2009-05-23
18:39:47 UTC (rev 11096)
@@ -6,6 +6,5 @@
exit 0
fi
-rm -f /etc/security/limits.d/libusrp2.limits
-
+/sbin/ldconfig
exit 0
Modified: gnuradio/branches/releases/3.2/debian/pyversions
===================================================================
--- gnuradio/branches/releases/3.2/debian/pyversions 2009-05-23 18:31:02 UTC
(rev 11095)
+++ gnuradio/branches/releases/3.2/debian/pyversions 2009-05-23 18:39:47 UTC
(rev 11096)
@@ -1 +1 @@
-2.5
+2.6
\ No newline at end of file
Modified: gnuradio/branches/releases/3.2/debian/rules
===================================================================
--- gnuradio/branches/releases/3.2/debian/rules 2009-05-23 18:31:02 UTC (rev
11095)
+++ gnuradio/branches/releases/3.2/debian/rules 2009-05-23 18:39:47 UTC (rev
11096)
@@ -6,14 +6,8 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-CFLAGS = -Wall -g
+export DH_PYCENTRAL=nomove
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
clean:
dh_testdir
dh_testroot
@@ -42,31 +36,34 @@
configure-stamp:
dh_testdir
[ -f ./configure ] || ./bootstrap
- CFLAGS="$(CFLAGS)" ./configure \
- --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --enable-shared \
- --enable-doxygen --enable-html-docs \
- --sysconfdir=/etc --enable-all-components \
- --disable-gr-audio-osx --disable-gr-audio-windows \
+ ./configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --enable-shared \
+ --sysconfdir=/etc \
+ --enable-all-components \
+ --disable-gr-audio-osx \
+ --disable-gr-audio-windows \
--disable-gcell --disable-gr-gcell \
--disable-gr-comedi --disable-usrp2-firmware
touch configure-stamp
-extract: extract-stamp
-extract-stamp: configure-stamp debian/gen-install-files.sh
- dh_testdir
- debian/gen-install-files.sh
- touch $@
-
build: build-stamp
-build-stamp: extract-stamp
+build-stamp: configure-stamp
- $(MAKE) -j
+ $(MAKE)
$(MAKE) check
touch $@
+extract: extract-stamp
+extract-stamp: build-stamp debian/gen-install-files.sh
+ dh_testdir
+ debian/gen-install-files.sh
+ touch $@
+
install: install-stamp
-install-stamp: build-stamp
+install-stamp: extract-stamp debian/control
dh_testdir
dh_testroot
dh_clean -k
@@ -111,7 +108,7 @@
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb --destdir=../debfiles
+ dh_builddeb
# Build architecture independant packages using the common target.
binary-indep: build install
Modified: gnuradio/branches/releases/3.2/dtools/bin/extract_install_filenames
===================================================================
--- gnuradio/branches/releases/3.2/dtools/bin/extract_install_filenames
2009-05-23 18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/dtools/bin/extract_install_filenames
2009-05-23 18:39:47 UTC (rev 11096)
@@ -54,7 +54,11 @@
if suffix.upper() != suffix:
raise SystemExit, "AM-variable-name is malformed. Expected something
like grgrpython_PYTHON"
- dirname = prefix + "dir"
+ if prefix[:5] == "dist_":
+ dirname = prefix[5:] + "dir"
+ else:
+ dirname = prefix + "dir"
+ #print "dirname =", dirname
tail = make_makefile_tail(dirname, full_var_name)
@@ -80,12 +84,12 @@
target_files = make.readline().rstrip()
if target_dirname.startswith('/'):
target_dirname = target_dirname[1:]
-
+
#print "target_dirname =", target_dirname
#print "target_files =", target_files
for f in target_files.split():
- sys.stdout.write(os.path.join(target_dirname, f) + '\n')
+ sys.stdout.write(os.path.join(target_dirname, f.split('/')[-1]) + '\n')
if __name__ == '__main__':
main()
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/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/apps/hf_radio/Makefile.am
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-05-23 18:39:47 UTC (rev 11096)
@@ -26,14 +26,14 @@
dist_ourdata_DATA = \
hfir.sci \
radio.xml \
+ input.py \
+ output.py \
README.TXT \
+ ssbagc.py \
+ ssbdemod.py \
+ startup.py \
ssb_taps
dist_ourdata_SCRIPTS = \
- input.py \
- output.py \
radio.py \
- ssbagc.py \
- ssbdemod.py \
- startup.py \
ui.py
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/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/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,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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,11000-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/Makefile.am
2009-05-23 18:39:47 UTC (rev 11096)
@@ -23,20 +23,22 @@
ourdatadir = $(exampledir)/digital
-dist_ourdata_DATA = \
- README
+dist_ourdata_DATA = \
+ README \
+ generic_usrp.py \
+ pick_bitrate.py \
+ receive_path.py \
+ receive_path_lb.py \
+ transmit_path.py \
+ transmit_path_lb.py \
+ usrp_options.py
dist_ourdata_SCRIPTS = \
benchmark_loopback.py \
benchmark_rx.py \
benchmark_tx.py \
gen_whitener.py \
- pick_bitrate.py \
- receive_path.py \
- receive_path_lb.py \
rx_voice.py \
run_length.py \
- transmit_path.py \
- transmit_path_lb.py \
tunnel.py \
tx_voice.py
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/Makefile.am
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/Makefile.am
2009-05-23 18:39:47 UTC (rev 11096)
@@ -23,8 +23,11 @@
ourdatadir = $(exampledir)/digital-bert
+dist_ourdata_DATA = \
+ README \
+ receive_path.py \
+ transmit_path.py
+
dist_ourdata_SCRIPTS = \
benchmark_rx.py \
- benchmark_tx.py \
- receive_path.py \
- transmit_path.py
+ benchmark_tx.py
\ No newline at end of file
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/transmit_path.py
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/transmit_path.py
2009-05-23 18:31:02 UTC (rev 11095)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital-bert/transmit_path.py
2009-05-23 18:39:47 UTC (rev 11096)
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#
# Copyright 2008 Free Software Foundation, Inc.
#
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
---
gnuradio/branches/releases/3.2/gnuradio-examples/python/mp-sched/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
+++
gnuradio/branches/releases/3.2/gnuradio-examples/python/mp-sched/Makefile.am
2009-05-23 18:39:47 UTC (rev 11096)
@@ -22,6 +22,9 @@
ourdatadir = $(exampledir)/mp-sched
+dist_ourdata_DATA = \
+ README
+
dist_ourdata_SCRIPTS = \
plot_flops.py \
run_synthetic.py \
Modified:
gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/gnuradio-examples/python/ofdm/Makefile.am
2009-05-23 18:39:47 UTC (rev 11096)
@@ -23,19 +23,20 @@
ourdatadir = $(exampledir)/ofdm
-dist_ourdata_DATA = \
- ofdm_sync.m \
- ofdm_sync_pn.m \
- plot_ofdm.m
+dist_ourdata_DATA = \
+ ofdm_sync.m \
+ ofdm_sync_pn.m \
+ fusb_options.py \
+ plot_ofdm.m \
+ pick_bitrate.py \
+ receive_path.py \
+ transmit_path.py
dist_ourdata_SCRIPTS = \
benchmark_ofdm.py \
benchmark_ofdm_rx.py \
benchmark_ofdm_tx.py \
fftshift.py \
- fusb_options.py \
- pick_bitrate.py \
- receive_path.py \
- transmit_path.py \
ofdm_mod_demod_test.py \
tunnel.py
+
Property changes on:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Property changes on:
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11043,11072,11078,11080-11082,11086-11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11043,11072,11078,11080-11082,11086-11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11043,11072,11078,11080-11082,11086-11087
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/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
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/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
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/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/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-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/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,11013-11022,11046-11059,11075-11077
/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-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Property changes on:
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/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,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
+
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/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,11013-11022,11046-11059,11075-11077
/gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Property changes on: gnuradio/branches/releases/3.2/grc/src/utils/odict.py
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/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,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
+ /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/trunk/grc/src/utils/odict.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11043,11062-11063,11072,11078,11080-11082,11086-11087
Modified: gnuradio/branches/releases/3.2/usrp2/firmware/configure.gnu
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/firmware/configure.gnu 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/usrp2/firmware/configure.gnu 2009-05-23
18:39:47 UTC (rev 11096)
@@ -21,6 +21,7 @@
(RANLIB=*) ;;
(STRIP=*) ;;
(F77=*) ;;
+ (FFLAGS=*) ;;
(CFLAGS=*) ;;
(CXXFLAGS=*) ;;
(CPPFLAGS=*) ;;
Modified: gnuradio/branches/releases/3.2/usrp2/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/host/lib/Makefile.am 2009-05-23
18:31:02 UTC (rev 11095)
+++ gnuradio/branches/releases/3.2/usrp2/host/lib/Makefile.am 2009-05-23
18:39:47 UTC (rev 11096)
@@ -50,7 +50,7 @@
libusrp2_la_LIBADD = \
$(OMNITHREAD_LA) \
- $(GRUEL_LIBS) \
+ $(GRUEL_LA) \
$(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
# Private headers not needed for above the API development
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11096 - in gnuradio/branches/releases/3.2: . debian dtools/bin gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/apps/hf_radio gnuradio-examples/python/digital gnuradio-examples/python/digital-bert gnuradio-examples/python/mp-sched gnuradio-examples/python/ofdm gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp2/firmware usrp2/host/lib,
jcorgan <=