[Commit-gnuradio] r6222 - gnuradio/trunk/debian

[jcorgan]

Author: jcorgan
Date: 2007-08-30 06:43:38 -0600 (Thu, 30 Aug 2007)
New Revision: 6222

Added:
   gnuradio/trunk/debian/libgnuradio-core0c2a.dirs
   gnuradio/trunk/debian/libgnuradio-core0c2a.install
   gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs
   gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install
   gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs
   gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install
Removed:
   gnuradio/trunk/debian/gnuradio-doc.install
   gnuradio/trunk/debian/gnuradio-examples.dirs
   gnuradio/trunk/debian/gnuradio.docs
   gnuradio/trunk/debian/gnuradio.install
   gnuradio/trunk/debian/libgnuradio-core0-dev.dirs
   gnuradio/trunk/debian/libgnuradio-core0-dev.install
   gnuradio/trunk/debian/libgnuradio-core0c2a.dirs
   gnuradio/trunk/debian/libgnuradio-core0c2a.install
   gnuradio/trunk/debian/libusrp0-dev.dirs
   gnuradio/trunk/debian/libusrp0-dev.install
   gnuradio/trunk/debian/libusrp0c2a.dirs
   gnuradio/trunk/debian/libusrp0c2a.install
   gnuradio/trunk/debian/python-gnuradio.dirs
   gnuradio/trunk/debian/python-gnuradio.install
   gnuradio/trunk/debian/python-usrp.dirs
   gnuradio/trunk/debian/python-usrp.install
   gnuradio/trunk/debian/usrp-doc.install
   gnuradio/trunk/debian/usrp-firmware.dirs
   gnuradio/trunk/debian/usrp-firmware.install
   gnuradio/trunk/debian/usrp-firmware.postinst
   gnuradio/trunk/debian/usrp.dirs
   gnuradio/trunk/debian/usrp.docs
   gnuradio/trunk/debian/usrp.hotplug
   gnuradio/trunk/debian/usrp.install
   gnuradio/trunk/debian/usrp.postinst
   gnuradio/trunk/debian/usrp.postrm
   gnuradio/trunk/debian/usrp.udev
Modified:
   gnuradio/trunk/debian/changelog
   gnuradio/trunk/debian/control
   gnuradio/trunk/debian/rules
Log:
Merged r6216:6221 from features/deb into trunk.  Work-in-progress on Debian 
package generation; merging now to avoid file substitution issues in Subversion 
as deleted files are reintroduced.

Modified: gnuradio/trunk/debian/changelog
===================================================================
--- gnuradio/trunk/debian/changelog     2007-08-30 05:43:56 UTC (rev 6221)
+++ gnuradio/trunk/debian/changelog     2007-08-30 12:43:38 UTC (rev 6222)
@@ -1,4 +1,4 @@
-gnuradio (3.1.0svn) UNRELEASED; urgency=low
+gnuradio (3.0svn) UNRELEASED; urgency=low
 
   * fix build failure with gcc-4.3 by adding a #include, closes: #420896
   * update copyright assertion on the debian/ contents, since I have

Modified: gnuradio/trunk/debian/control
===================================================================
--- gnuradio/trunk/debian/control       2007-08-30 05:43:56 UTC (rev 6221)
+++ gnuradio/trunk/debian/control       2007-08-30 12:43:38 UTC (rev 6222)
@@ -8,192 +8,35 @@
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
 
-Package: gnuradio
+Package: libgnuradio-omnithread0c2a
+Section: libs
 Architecture: any
-Section: comm
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, gnuradio-doc, 
libgnuradio-core0-dev, libgnuradio-core0c2a, libgnuradio-core0c2a-dbg, 
python-gnuradio (= ${Source-Version}), python-wxgtk2.6, gnuradio-examples
-Suggests: usrp
-Conflicts: gr-audio-alsa, gr-audio-oss, gr-audio-jack
-Replaces: gr-audio-alsa, gr-audio-oss, gr-audio-jack
-XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts:  
+Replaces:  
+Recommends: 
+Suggests: 
 Description: Software Defined Radio
- This is a meta-package that depends on the various components of a complete
- installation of the GNU Radio softare defined radio system.
- .
- If you have a USRP, you probably also want to install the usrp package as
- suggested, which lives in contrib because the FPGA bitstrings require 
- non-free tools to build.
+ This package is a fork of the omniORB-4.0.1 threading library
+ for use with GNU Radio.
 
-Package: gnuradio-doc
-Section: doc
-Architecture: all
-Depends: ${shlibs:Depends}
-Description: Software Defined Radio
- This package contains the documentation for the GNU Radio software
- defined radio system.
-
-Package: libgnuradio-core0-dev
+Package: libgnuradio-omnithread0-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-core0c2a (= ${Source-Version})
+Depends: libgnuradio-omnithread0c2a (= ${Source-Version})
 Description: Software Defined Radio
- This library contains Signal Processing routines that implement
- the functionality of traditional radio receivers and transmitters.
+ This package is a fork of the omniORB-4.0.1 threading library
+ for use with GNU Radio.
  .
- The GNU Radio homepage is http://www.gnu.org/software/gnuradio
- .
  This package contains header files needed by developers.
 
 Package: libgnuradio-core0c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnuradio-omnithread0c2a
 Conflicts:  libgnuradio-core0, libgnuradio-core0c2
 Replaces:  libgnuradio-core0, libgnuradio-core0c2
-Recommends: python-gnuradio
-Suggests: gnuradio-doc, gnuradio-examples
+Recommends: 
+Suggests:
 Description: Software Defined Radio
  This package contains the core GNU Radio libraries.
-
-Package: libgnuradio-core0c2a-dbg
-Section: libdevel
-Architecture: any
-Depends: libgnuradio-core0c2a (= ${Source-Version}), ${shlibs:Depends}
-Description: Software Defined Radio
- This package contains the debug symbols needed to debug programs that
- use the GNU Radio core libraries.
-
-Package: usrp
-Section: contrib/comm
-Architecture: any
-Depends: ${shlibs:Depends}, python, libusrp0-dev, libusrp0c2a-dbg, python-usrp 
(= ${Source-Version})
-Recommends: gnuradio, hotplug, usrp-doc, usrp-firmware
-XB-Python-Version: ${python:Versions}
-Description: control applications and firmware for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.  Visit ettus.com for more information on the USRP.
- .
- This package contains a tool for loading firmware and doing other
- simple administrative tasks for the USRP (usrper), as well as the
- actual firmware binaries for the microcontroller.  
- .
- This package also depends on all of the other USRP-related packages 
- so that installing this package will pull in all the pieces you might 
- want or need to successfully use the USRP with GNU Radio.
-
-Package: usrp-doc
-Section: doc
-Architecture: all
-Depends: ${shlibs:Depends}
-Description: Software Defined Radio with USRP
- This package contains the documentation for the USRP support that is
- part of the GNU Radio software defined radio system.
-
-Package: usrp-firmware
-Section: contrib/comm
-Architecture: all
-Recommends: usrp
-Description: control applications and firmware for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the basic FPGA bitstrings for normal USRP operation,
- which need non-free tools to build.
-
-Package: libusrp0-dev
-Provides: libusrp-dev
-Conflicts: libusrp-dev
-Section: contrib/libdevel
-Architecture: any
-Depends: libusrp0c2a (= ${Source-Version}), ${shlibs:Depends}
-Description: development library files for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains development files for the client-side library.
-
-Package: libusrp0c2a
-Section: contrib/libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: usrp
-Conflicts: libusrp0
-Replaces: libusrp0
-Description: client side library for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the client-side library, providing an easy interface
- for communicating with the USRP.
-
-Package: libusrp0c2a-dbg
-Priority: extra
-Section: contrib/libdevel
-Architecture: any
-Depends: libusrp0c2a (= ${Source-Version}), ${shlibs:Depends}
-Description: client side library debugging symbols for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the debug symbols needed to debug programs that
- use the USRP client-side library.
-
-Package: python-gnuradio
-Architecture: any
-Depends: ${python:Depends}, libgnuradio-core0c2a, python-numeric
-Conflicts: gr-wxgui
-Replaces: gr-wxgui
-Provides: ${python:Provides}
-Section: python
-XB-Python-Version: ${python:Versions}
-Description: Python bindings for GNU Radio
- This provides the module that enable one to use gnuradio from Python
- scripts.  You will need Python and gnuradio-dev installed to use this.
-
-Package: python-usrp
-Section: contrib/libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
-Replaces: python2.3-usrp
-Conflicts: python2.3-usrp
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: Python binding for the USRP client side library
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the Python bindings for the client-side library.
-
-Package: gnuradio-examples
-Architecture: all
-Depends: ${python:Depends}, libgnuradio-core0c2a, python-gnuradio
-XB-Python-Version: ${python:Versions}
-Description: Example programs to test and use GNU Radio
- This package contains Python programs which uses and tests
- the GNU Radio libraries. The examples include dialtone generation,
- complete FM receiver and many more exciting applications.
-

Deleted: gnuradio/trunk/debian/gnuradio-doc.install

Deleted: gnuradio/trunk/debian/gnuradio-examples.dirs

Deleted: gnuradio/trunk/debian/gnuradio.docs

Deleted: gnuradio/trunk/debian/gnuradio.install

Deleted: gnuradio/trunk/debian/libgnuradio-core0-dev.dirs

Deleted: gnuradio/trunk/debian/libgnuradio-core0-dev.install

Deleted: gnuradio/trunk/debian/libgnuradio-core0c2a.dirs

Copied: gnuradio/trunk/debian/libgnuradio-core0c2a.dirs (from rev 6221, 
gnuradio/branches/features/deb/debian/libgnuradio-core0c2a.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-core0c2a.dirs                             
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-core0c2a.dirs     2007-08-30 12:43:38 UTC 
(rev 6222)
@@ -0,0 +1 @@
+usr/lib

Deleted: gnuradio/trunk/debian/libgnuradio-core0c2a.install

Copied: gnuradio/trunk/debian/libgnuradio-core0c2a.install (from rev 6221, 
gnuradio/branches/features/deb/debian/libgnuradio-core0c2a.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-core0c2a.install                          
(rev 0)
+++ gnuradio/trunk/debian/libgnuradio-core0c2a.install  2007-08-30 12:43:38 UTC 
(rev 6222)
@@ -0,0 +1,2 @@
+usr/lib/libgnuradio-core.la
+usr/lib/libgnuradio-core.so.*

Copied: gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs (from rev 6221, 
gnuradio/branches/features/deb/debian/libgnuradio-omnithread0-dev.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs                      
        (rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread0-dev.dirs      2007-08-30 
12:43:38 UTC (rev 6222)
@@ -0,0 +1 @@
+usr/include/gnuradio

Copied: gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install (from rev 
6221, gnuradio/branches/features/deb/debian/libgnuradio-omnithread0-dev.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install                   
        (rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread0-dev.install   2007-08-30 
12:43:38 UTC (rev 6222)
@@ -0,0 +1,2 @@
+usr/include/gnuradio/omnithread.h
+usr/include/gnuradio/ot_posix.h

Copied: gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs (from rev 6221, 
gnuradio/branches/features/deb/debian/libgnuradio-omnithread0c2a.dirs)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs                       
        (rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread0c2a.dirs       2007-08-30 
12:43:38 UTC (rev 6222)
@@ -0,0 +1,2 @@
+usr/lib
+

Copied: gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install (from rev 
6221, gnuradio/branches/features/deb/debian/libgnuradio-omnithread0c2a.install)
===================================================================
--- gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install                    
        (rev 0)
+++ gnuradio/trunk/debian/libgnuradio-omnithread0c2a.install    2007-08-30 
12:43:38 UTC (rev 6222)
@@ -0,0 +1,3 @@
+usr/lib/libgromnithread.la
+usr/lib/libgromnithread.so
+

Deleted: gnuradio/trunk/debian/libusrp0-dev.dirs

Deleted: gnuradio/trunk/debian/libusrp0-dev.install

Deleted: gnuradio/trunk/debian/libusrp0c2a.dirs

Deleted: gnuradio/trunk/debian/libusrp0c2a.install

Deleted: gnuradio/trunk/debian/python-gnuradio.dirs

Deleted: gnuradio/trunk/debian/python-gnuradio.install

Deleted: gnuradio/trunk/debian/python-usrp.dirs

Deleted: gnuradio/trunk/debian/python-usrp.install

Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2007-08-30 05:43:56 UTC (rev 6221)
+++ gnuradio/trunk/debian/rules 2007-08-30 12:43:38 UTC (rev 6222)
@@ -75,8 +75,8 @@
        dh_installdirs
 
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       install -m 0755 debian/usrp.hotplug \
-               $(CURDIR)/debian/usrp/etc/hotplug.d/usb/
+#      install -m 0755 debian/usrp.hotplug \
+#              $(CURDIR)/debian/usrp/etc/hotplug.d/usb/
 
        : # make python scripts starting with '#!' executable
        for i in `find debian -mindepth 2 -type f ! -perm 755`; do \
@@ -88,19 +88,19 @@
 
        dh_install --sourcedir=debian/tmp --list-missing
 
-       cp -r gnuradio-examples/python/* \
-               debian/gnuradio-examples/usr/share/gnuradio/
-       find debian/gnuradio-examples -type f -name Makefile\* -exec rm {} \;
-       find debian/gnuradio-examples -type d -name CVS -exec rm {} \;
-       find debian/gnuradio-examples -name \*.py -exec chmod +x {} \;
+#      cp -r gnuradio-examples/python/* \
+#              debian/gnuradio-examples/usr/share/gnuradio/
+#      find debian/gnuradio-examples -type f -name Makefile\* -exec rm {} \;
+#      find debian/gnuradio-examples -type d -name CVS -exec rm {} \;
+#      find debian/gnuradio-examples -name \*.py -exec chmod +x {} \;
 
 #      mv debian/gnuradio/usr/bin/microtune.py \
 #              debian/gnuradio/usr/bin/microtune
 
-       mv debian/usrp/usr/bin/usrp_ra_receiver.py \
-               debian/usrp/usr/bin/usrp_ra_receiver
-       mv debian/usrp/usr/bin/usrp_psr_receiver.py \
-               debian/usrp/usr/bin/usrp_psr_receiver
+#      mv debian/usrp/usr/bin/usrp_ra_receiver.py \
+#              debian/usrp/usr/bin/usrp_ra_receiver
+#      mv debian/usrp/usr/bin/usrp_psr_receiver.py \
+#              debian/usrp/usr/bin/usrp_psr_receiver
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

Deleted: gnuradio/trunk/debian/usrp-doc.install

Deleted: gnuradio/trunk/debian/usrp-firmware.dirs

Deleted: gnuradio/trunk/debian/usrp-firmware.install

Deleted: gnuradio/trunk/debian/usrp-firmware.postinst

Deleted: gnuradio/trunk/debian/usrp.dirs

Deleted: gnuradio/trunk/debian/usrp.docs

Deleted: gnuradio/trunk/debian/usrp.hotplug

Deleted: gnuradio/trunk/debian/usrp.install

Deleted: gnuradio/trunk/debian/usrp.postinst

Deleted: gnuradio/trunk/debian/usrp.postrm

Deleted: gnuradio/trunk/debian/usrp.udev