[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11072 - in gnuradio/trunk: . debian dtools/bin gnurad
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11072 - in gnuradio/trunk: . debian dtools/bin gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gnuradio-examples/python/digital-bert gnuradio-examples/python/mp-sched gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp2/fpga/top/u2_rev3_iad |
|
Date: |
Wed, 20 May 2009 09:35:56 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-20 09:35:55 -0600 (Wed, 20 May 2009)
New Revision: 11072
Modified:
gnuradio/trunk/
gnuradio/trunk/debian/control
gnuradio/trunk/debian/gen-install-files.sh
gnuradio/trunk/debian/libusrp.postrm
gnuradio/trunk/debian/libusrp2.postrm
gnuradio/trunk/debian/rules
gnuradio/trunk/dtools/bin/extract_install_filenames
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
gnuradio/trunk/gnuradio-examples/python/digital/
gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am
gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
gnuradio/trunk/gr-qtgui/src/python/usrp_display.py
gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py
gnuradio/trunk/grc/src/utils/odict.py
gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/Makefile
gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
Log:
Merged r11045:11059 from jcorgan/deb into trunk. Updates on Ubuntu binary
packaging; also fixes missing files in digital example directory.
Property changes on: gnuradio/trunk
___________________________________________________________________
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,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/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/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
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
Modified: gnuradio/trunk/debian/control
===================================================================
--- gnuradio/trunk/debian/control 2009-05-20 08:13:14 UTC (rev 11071)
+++ gnuradio/trunk/debian/control 2009-05-20 15:35:55 UTC (rev 11072)
@@ -162,7 +162,7 @@
Section: libdevel
Architecture: any
Depends: libusrp2 (= ${binary:Version}), libboost-thread1.37-dev,
libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (=
${binary:Version})
-Description: Client side library for the USRP(1) hardware
+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
@@ -302,6 +302,7 @@
Package: python-gnuradio-wxgui
Architecture: any
Depends: ${python:Depends}, python-gnuradio-core (= ${binary:Version}),
python-wxgtk2.8, python-opengl
+Conflicts: python-wxgtk2.6
Provides: ${python:Provides}
Section: python
XB-Python-Version: ${python:Versions}
@@ -309,6 +310,26 @@
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
@@ -349,56 +370,79 @@
This package provides the Python interface to the GNU Radio driver
for the OSS audio system.
-#Package: python-gnuradio-atsc
-#Architecture: any
-#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-#Provides: ${python:Provides}
-#Section: python
-#XB-Python-Version: ${python:Versions}
-#Description: GNU Radio ATSC Receiver
-# This package provides a decoder for ATSC waveforms using GNU Radio.
+Package: python-gnuradio-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-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-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-trellis
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
+Provides: ${python:Provides}
+Section: python
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Trellis-Coded Modulation library
+ This package provides an implementation of trellis-coded modulation
+ for GNU Radio.
-#Package: python-gnuradio-video-sdl
-#Architecture: any
-#Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core
-#Provides: ${python:Provides}
-#Section: python
-#XB-Python-Version: ${python:Versions}
-#Description: GNU Radio SDL Interface Library
-# This package provides an interface to the SDL rendering library
-# for GNU Radio.
+Package: python-gnuradio-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
+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.
+
+################################################################################
# Documentation packages
#
################################################################################
@@ -409,16 +453,54 @@
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: gnuradio-dev
+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
-Recommends: gnuradio-doc, libgnuradio-audio-alsa-dev, libgnuradio-qtgui-dev,
libgnuradio-usrp-dev, libgnuradio-usrp2-dev
-Depends: libgnuradio-core-dev
+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 various GNU Radio components. It is only needed if you
intend
+ 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
+Section: comm
+Architecture: all
+Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio,
gnuradio-utils, gnuradio-examples
+Description: The GNU Software Radio Toolkit
+ This is a virtual package that installs the entire GNU Radio and USRP software
+ set.
Modified: gnuradio/trunk/debian/gen-install-files.sh
===================================================================
--- gnuradio/trunk/debian/gen-install-files.sh 2009-05-20 08:13:14 UTC (rev
11071)
+++ gnuradio/trunk/debian/gen-install-files.sh 2009-05-20 15:35:55 UTC (rev
11072)
@@ -162,6 +162,24 @@
$EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME
$EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME
+# python-gnuradio-usrp
+NAME=debian/python-gnuradio-usrp.install
+rm -f $NAME
+touch $NAME
+$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
+
+# 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
@@ -201,67 +219,54 @@
$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES | \
sed -e 's/\.la$/.so/' >>$NAME
-exit 0
-
-# python-gnuradio-atsc
-NAME=debian/python-gnuradio-atsc.install
-rm -f $NAME
-touch $NAME
-$EXTRACT gr-atsc/src/lib/Makefile atsc_python_PYTHON >>$NAME
-$EXTRACT gr-atsc/src/lib/Makefile atsc_pylib_LTLIBRARIES >>$NAME
-$EXTRACT gr-atsc/src/lib/Makefile atsc_pylib_LTLIBRARIES | \
- sed -e 's/\.la$/.so/' >>$NAME
-$EXTRACT gr-atsc/src/python/Makefile dist_ourdata_SCRIPTS >>$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 | \
- sed -e 's/\.la$/.so/' >>$NAME
-
# python-gnuradio-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
@@ -275,20 +280,29 @@
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
+exit 0
+
# gnuradio-gpio
NAME=debian/gnuradio-gpio.install
rm -f $NAME
Modified: gnuradio/trunk/debian/libusrp.postrm
===================================================================
--- gnuradio/trunk/debian/libusrp.postrm 2009-05-20 08:13:14 UTC (rev
11071)
+++ gnuradio/trunk/debian/libusrp.postrm 2009-05-20 15:35:55 UTC (rev
11072)
@@ -6,6 +6,5 @@
exit 0
fi
-rm -f /etc/udev/rules.d/40-usrp.rules
-ldconfig
+/sbin/ldconfig
exit 0
Modified: gnuradio/trunk/debian/libusrp2.postrm
===================================================================
--- gnuradio/trunk/debian/libusrp2.postrm 2009-05-20 08:13:14 UTC (rev
11071)
+++ gnuradio/trunk/debian/libusrp2.postrm 2009-05-20 15:35:55 UTC (rev
11072)
@@ -6,6 +6,5 @@
exit 0
fi
-rm -f /etc/security/limits.d/libusrp2.limits
-ldconfig
+/sbin/ldconfig
exit 0
Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2009-05-20 08:13:14 UTC (rev 11071)
+++ gnuradio/trunk/debian/rules 2009-05-20 15:35:55 UTC (rev 11072)
@@ -34,31 +34,35 @@
configure-stamp:
dh_testdir
[ -f ./configure ] || ./bootstrap
- ./configure LDFLAGS="-Wl,--as-needed" \
- --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 \
+ --enable-doxygen \
+ --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) 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
Modified: gnuradio/trunk/dtools/bin/extract_install_filenames
===================================================================
--- gnuradio/trunk/dtools/bin/extract_install_filenames 2009-05-20 08:13:14 UTC
(rev 11071)
+++ gnuradio/trunk/dtools/bin/extract_install_filenames 2009-05-20 15:35:55 UTC
(rev 11072)
@@ -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)
Property changes on:
gnuradio/trunk/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,11013-11022
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
+
/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
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
Property changes on: gnuradio/trunk/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,11013-11022
/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/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
/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
Modified: gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am 2009-05-20
08:13:14 UTC (rev 11071)
+++ gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am 2009-05-20
15:35:55 UTC (rev 11072)
@@ -31,6 +31,7 @@
benchmark_rx.py \
benchmark_tx.py \
gen_whitener.py \
+ generic_usrp.py \
pick_bitrate.py \
receive_path.py \
receive_path_lb.py \
@@ -39,4 +40,5 @@
transmit_path.py \
transmit_path_lb.py \
tunnel.py \
- tx_voice.py
+ tx_voice.py \
+ usrp_options.py
Modified: gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
2009-05-20 08:13:14 UTC (rev 11071)
+++ gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
2009-05-20 15:35:55 UTC (rev 11072)
@@ -23,6 +23,9 @@
ourdatadir = $(exampledir)/digital-bert
+dist_ourdata_DATA = \
+ README
+
dist_ourdata_SCRIPTS = \
benchmark_rx.py \
benchmark_tx.py \
Modified: gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
2009-05-20 08:13:14 UTC (rev 11071)
+++ gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
2009-05-20 15:35:55 UTC (rev 11072)
@@ -22,6 +22,9 @@
ourdatadir = $(exampledir)/mp-sched
+dist_ourdata_DATA = \
+ README
+
dist_ourdata_SCRIPTS = \
plot_flops.py \
run_synthetic.py \
Property changes on: gnuradio/trunk/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,11013-11022
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
+
/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
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
Property changes on:
gnuradio/trunk/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,11013-11022
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
+
/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
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
Property changes on:
gnuradio/trunk/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,11013-11022
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_add_xx.xml:10771-10887
/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/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
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_add_xx.xml:10771-10887
/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
Property changes on:
gnuradio/trunk/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,11013-11022
/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/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
/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
Property changes on:
gnuradio/trunk/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,11013-11022
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10771-10887
/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/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
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10771-10887
/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
Property changes on: gnuradio/trunk/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,11013-11022
+
/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
Property changes on: gnuradio/trunk/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,11013-11022
+ /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
Property changes on: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/Makefile
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/fpga/top/u2_rev3/Makefile:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/Makefile:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/Makefile:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/Makefile:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/top/u2_rev3/Makefile:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/top/u2_rev3/Makefile:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/top/u2_rev3/Makefile:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/Makefile:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/top/u2_rev3/Makefile:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/top/u2_rev3/Makefile:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/top/u2_rev3/Makefile:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/top/u2_rev3/Makefile:10540-10546
+
/gnuradio/branches/developers/eb/t348/usrp2/fpga/top/u2_rev3/Makefile:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/Makefile:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/Makefile:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/Makefile:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/top/u2_rev3/Makefile:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/top/u2_rev3/Makefile:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/top/u2_rev3/Makefile:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/Makefile:10949-10959,11013-11022,11046-11059
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/top/u2_rev3/Makefile:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/top/u2_rev3/Makefile:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/top/u2_rev3/Makefile:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/top/u2_rev3/Makefile:10540-10546
Property changes on: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/fpga/sdr_lib/dsp_core_rx.v:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/sdr_lib/dsp_core_rx.v:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/sdr_lib/dsp_core_rx.v:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/sdr_lib/dsp_core_rx.v:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/sdr_lib/dsp_core_rx.v:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/sdr_lib/dsp_core_rx.v:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/sdr_lib/dsp_core_rx.v:10540-10546
+
/gnuradio/branches/developers/eb/t348/usrp2/fpga/sdr_lib/dsp_core_rx.v:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/sdr_lib/dsp_core_rx.v:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/sdr_lib/dsp_core_rx.v:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/sdr_lib/dsp_core_rx.v:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10949-10959,11013-11022,11046-11059
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/sdr_lib/dsp_core_rx.v:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/sdr_lib/dsp_core_rx.v:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/sdr_lib/dsp_core_rx.v:10540-10546
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11072 - in gnuradio/trunk: . debian dtools/bin gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gnuradio-examples/python/digital-bert gnuradio-examples/python/mp-sched gr-qtgui/src/python gr-wxgui/src/python/plotter grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils usrp2/fpga/top/u2_rev3_iad,
jcorgan <=