commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9900 - in gnuradio/branches/developers/jcorgan/deb-wi


From: jcorgan
Subject: [Commit-gnuradio] r9900 - in gnuradio/branches/developers/jcorgan/deb-wip: debian usrp/host/lib/inband
Date: Thu, 30 Oct 2008 15:13:20 -0600 (MDT)

Author: jcorgan
Date: 2008-10-30 15:13:19 -0600 (Thu, 30 Oct 2008)
New Revision: 9900

Added:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev
Removed:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband0c2a.dirs
   
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband0c2a.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.install
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postinst
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postrm
   gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.udev
   gnuradio/branches/developers/jcorgan/deb-wip/debian/usrp-firmware.dirs
   gnuradio/branches/developers/jcorgan/deb-wip/debian/usrp-firmware.install
Modified:
   gnuradio/branches/developers/jcorgan/deb-wip/debian/control
   gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/deb-wip/debian/rules
   gnuradio/branches/developers/jcorgan/deb-wip/usrp/host/lib/inband/Makefile.am
Log:
wip, usrp related packages updated, reorganized sections, dependencies

Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-10-30 
18:51:18 UTC (rev 9899)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/control 2008-10-30 
21:13:19 UTC (rev 9900)
@@ -244,62 +244,29 @@
 Package: python-gnuradio
 Section: python
 Architecture: all
-Depends: python-gnuradio-core, python-gnuradio-wxgui, 
python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-atsc, 
python-gnuradio-comedi, python-gnuradio-cvsd-vocoder, 
python-gnuradio-gsm-fr-vocoder, python-gnuradio-trellis, 
python-gnuradio-video-sdl
+Recommends: python-gnuradio-core, python-gnuradio-wxgui, 
python-gnuradio-audio-alsa | python-gnuradio-audio, python-gnuradio-atsc, 
python-gnuradio-cvsd-vocoder, python-gnuradio-gsm-fr-vocoder, 
python-gnuradio-trellis, python-gnuradio-video-sdl
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python Libraries for GNU Radio Components
  This is a virtual package that depends upon all the Python components 
  for GNU Radio.
 
-Package: gnuradio-examples
-Architecture: any
-Suggests: usrp
-Depends: ${python:Depends}, python-gnuradio-core, python-gnuradio-wxgui, 
python-gnuradio-audio-alsa | python-gnuradio-audio
-Section: comm
-XB-Python-Version: ${python:Versions}
-Description: GNU Radio Example Programs
- This package provides examples of GNU Radio usage using Python
-
-Package: gnuradio
-Section: comm
-Architecture: all
-Depends: gnuradio-doc, python-gnuradio, gnuradio-examples, gnuradio-utils
-Suggests: usrp
-Description: GNU Software Defined Radio
- This is a virtual package that depends the entire GNU Radio collection of
- components.  If you are using a USRP, you should also install the usrp 
package.
-
 Package: gnuradio-dev
 Section: libdevel
 Architecture: all
-Depends: libgnuradio-core0-dev, libgnuradio-omnithread0-dev, libmblock0-dev, 
libpmt0-dev
+Recommends: libgnuradio-audio-alsa-dev
+Depends: libgnuradio-core0-dev, libmblock0-dev, libpmt0-dev
 Description: Development headers for GNU Radio C++ development
  This is a virtual package that depends on all the development header packages
  for the various GNU Radio components.  It is only needed if you intend to 
  develop custom GNU Radio signal processing blocks in C++.
 
-Package: usrp-firmware
-Section: contrib/comm
-Architecture: all
-Description: control applications and firmware for the USRP
- The Universal Software Radio Peripheral (USRP) is an USB-connected,
- low-cost and open board. It features four high-speed analog-to-digital
- and digital-to-analog converters, an FPGA and a microcontroller. It's
- ideal for capturing or transmitting various signals, usually in
- combination with GNU Radio. The design schemas are available under a
- free license.
- .
- This package contains the basic FPGA bitstrings for normal USRP operation,
- which need non-free tools to build.
-
-Package: libusrp0c2a
-Section: contrib/libs
+Package: libusrp
+Section: comm
 Architecture: any
-Depends: ${shlibs:Depends}, usrp-firmware
-Conflicts: libusrp0
-Replaces: libusrp0
+Replaces: libusrp0, libusrp0c2a, usrp-firmware
 Suggests: usrp-doc
-Description: Client side library for the USRP
+Description: Client side library for the USRP(1) hardware
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
  low-cost and open board. It features four high-speed analog-to-digital
  and digital-to-analog converters, an FPGA and a microcontroller. It's
@@ -310,11 +277,12 @@
  This package contains the client-side library, providing an easy interface
  for communicating with the USRP.
 
-Package: libusrp0-dev
-Section: contrib/libdevel
+Package: libusrp-dev
+Section: libdevel
 Architecture: any
-Depends: libusrp0c2a (= ${binary:Version}), libusb-dev
-Description: Client side library for the USRP
+Replaces: libusrp0-dev
+Depends: libusrp (= ${binary:Version}), libusb-dev
+Description: Client side library for the USRP(1) hardware
  The Universal Software Radio Peripheral (USRP) is an USB-connected,
  low-cost and open board. It features four high-speed analog-to-digital
  and digital-to-analog converters, an FPGA and a microcontroller. It's
@@ -327,18 +295,18 @@
  .
  This package contains header files needed by developers.
 
-Package: libusrp-inband0c2a
-Section: contrib/libs
+Package: libusrp-inband
+Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Client side library for the USRP with in-band signaling
  The package is an alternative C++ interface to the USRP that implements
  an experimental in-band signaling method across the USB.
 
-Package: libusrp-inband0-dev
-Section: contrib/libdevel
+Package: libusrp-inband-dev
+Section: libdevel
 Architecture: any
-Depends: libusrp-inband0c2a (= ${binary:Version}), libusrp0-dev
+Depends: libusrp-inband (= ${binary:Version}), libusrp-dev
 Description: Client side library for the USRP with in-band signaling
  The package is an alternative C++ interface to the USRP that implements
  an experimental in-band signaling method across the USB.
@@ -356,7 +324,7 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
-Section: contrib/python
+Section: python
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for the USRP library
  This package provides the modules that enable one to use the USRP as a
@@ -366,7 +334,7 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-core, 
python-usrp
 Provides: ${python:Provides}
-Section: contrib/python
+Section: python
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for GNU Radio USRP driver
  This package provides the Python interface to the GNU Radio USRP
@@ -374,30 +342,48 @@
 
 Package: gnuradio-utils
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
python-gnuradio-wxgui
+Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
python-gnuradio-wxgui, python-matplotlib, python-tk, python-scipy
 Provides: ${python:Provides}
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Utilities
  This package provides commonly used utilities for GNU Radio
 
 Package: usrp
-Section: contrib/comm
+Section: comm
 Architecture: all
-Depends: usrp-doc, usrp-firmware, libusrp0c2a
+Depends: usrp-doc, libusrp
 Description: The Universal Software Radio Peripheral
- This is a virtual package that depends on the entire USRP software collection.
+ This is a virtual package that depends on the non-GNU Radio USRP 
+ software collection.
 
+Package: gnuradio-examples
+Architecture: any
+Depends: ${python:Depends}, python-gnuradio-core
+Recommends: python-gnuradio-wxgui, python-gnuradio-audio-alsa | 
python-gnuradio-audio, python-gnuradio-usrp
+Section: comm
+XB-Python-Version: ${python:Versions}
+Description: GNU Radio Example Programs
+ This package provides examples of GNU Radio usage using Python
+
+Package: gnuradio
+Section: comm
+Architecture: all
+Recommends: gnuradio-doc, python-gnuradio, gnuradio-examples, gnuradio-utils
+Description: GNU Software Defined Radio
+ This is a virtual package that depends the entire GNU Radio collection of
+ components.  If you are using a USRP, you should also install the usrp 
package.
+
 Package: gnuradio-pager
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio FLEX Pager Decoder
  This package provides a decoder for the FLEX paging protocol for GNU Radio
 
 Package: gnuradio-sounder-firmware
-Section: contrib/comm
+Section: comm
 Architecture: all
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
@@ -408,13 +394,13 @@
 Package: gnuradio-sounder
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
gnuradio-sounder-firmware
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Channel Sounder Application
  This package provides an RF channel sounder application for GNU Radio
 
 Package: gnuradio-gpio-firmware
-Section: contrib/comm
+Section: comm
 Architecture: all
 Description: GNU Radio Streaming GPIO Application
  This package provides streaming digital GPIO capabilities for GNU Radio
@@ -425,13 +411,13 @@
 Package: gnuradio-gpio
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
gnuradio-gpio-firmware
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Streaming Digital Application
  This package provides a streaming digital GPIO capabilities for GNU Radio
 
 Package: gnuradio-radar-mono-firmware
-Section: contrib/comm
+Section: comm
 Architecture: all
 Description: GNU Radio Monostatic Radar Firmware
  This package provides a monostatic radar application for GNU Radio
@@ -442,7 +428,7 @@
 Package: gnuradio-radar-mono
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
gnuradio-radar-mono-firmware
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Monostatic Radar Application
  This package provides a monostatic radar application for GNU Radio
@@ -450,7 +436,7 @@
 Package: gnuradio-radio-astronomy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, python-gnuradio-usrp, 
python-gnuradio-wxgui
-Section: contrib/comm
+Section: comm
 XB-Python-Version: ${python:Versions}
 Description: GNU Radio Radio Astronomy Applications
  This package provides radio astronomy applications for GNU Radio

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-10-30 18:51:18 UTC (rev 9899)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/gen-install-files.sh    
2008-10-30 21:13:19 UTC (rev 9900)
@@ -48,18 +48,22 @@
 $EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON 
>>$NAME
 $EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile 
grvocoderpython_PYTHON >>$NAME
 
-# libusrp0-dev
-NAME=debian/libusrp0-dev.install
+# libusrp-dev
+NAME=debian/libusrp-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT usrp/host/lib/legacy/Makefile include_HEADERS >>$NAME
 $EXTRACT usrp/firmware/include/Makefile include_HEADERS >>$NAME
+echo usr/lib/libusrp.so >>$NAME
+echo usr/lib/pkgconfig/usrp.pc >>$NAME
 
-# libusrp-inband0-dev
-NAME=debian/libusrp-inband0-dev.install
+# libusrp-inband-dev
+NAME=debian/libusrp-inband-dev.install
 rm -f $NAME
 touch $NAME
 $EXTRACT usrp/host/lib/inband/Makefile include_HEADERS >>$NAME
+echo usr/lib/libusrp-inband.so >>$NAME
+echo usr/lib/pkgconfig/usrp-inband.pc >>$NAME
 
 # python-usrp
 NAME=debian/python-usrp.install
@@ -126,6 +130,7 @@
     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
@@ -136,6 +141,7 @@
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-audio-oss
+# TODO: break out libgnuradio-audio-oss
 NAME=debian/python-gnuradio-audio-oss.install
 rm -f $NAME
 touch $NAME
@@ -146,6 +152,7 @@
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-audio-portaudio
+# TODO: break out libgnuradio-audio-portaudio
 NAME=debian/python-gnuradio-audio-portaudio.install
 rm -f $NAME
 touch $NAME
@@ -165,6 +172,7 @@
 #    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
@@ -175,6 +183,7 @@
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-gsm-fr-vocoder
+# TODO: break out libgnuradio-gsm-fr-vocoder
 NAME=debian/python-gnuradio-gsm-fr-vocoder.install
 rm -f $NAME
 touch $NAME
@@ -184,6 +193,7 @@
     sed -e 's/\.la$/.so/' >>$NAME
 
 # python-gnuradio-trellis
+# TODO: break out libgnuradio-trellis
 NAME=debian/python-gnuradio-trellis.install
 rm -f $NAME
 touch $NAME
@@ -195,6 +205,7 @@
 $EXTRACT gr-trellis/src/examples/fsm_files/Makefile ourdata_DATA >>$NAME
 
 # python-gnuradio-video-sdl
+# TODO: break out libgnuradio-video-sdl
 NAME=debian/python-gnuradio-video-sdl.install
 rm -f $NAME
 touch $NAME
@@ -217,14 +228,16 @@
 $EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile ourdata_DATA 
>>$NAME
 $EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/audio/Makefile ourdata_DATA >>$NAME
-$EXTRACT gnuradio-examples/python/dect/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/digital/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/digital_voice/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/multi-antenna/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/multi_usrp/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/network/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/ofdm/Makefile ourdata_DATA >>$NAME
 $EXTRACT gnuradio-examples/python/usrp/Makefile ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/usrp2/Makefile ourdata_DATA >>$NAME
 
 # gnuradio-gpio
 NAME=debian/gnuradio-gpio.install

Copied: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install 
(from rev 9889, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband0c2a.install)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install  
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install  
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1,2 @@
+usr/lib/libusrp-inband.la
+usr/lib/libusrp-inband.so.*


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband0c2a.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp-inband0c2a.install

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs (from 
rev 9891, gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.dirs)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs            
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs    
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1,4 @@
+usr/lib
+etc/udev/rules.d
+/usr/share/usrp/rev2
+/usr/share/usrp/rev4


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install 
(from rev 9889, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.install)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install         
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install 
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1,11 @@
+usr/lib/libusrp.la
+usr/lib/libusrp.so.*
+etc/udev/rules.d/40-usrp.rules
+usr/share/usrp/rev2/multi_2rxhb_2tx.rbf
+usr/share/usrp/rev2/std.ihx
+usr/share/usrp/rev2/std_2rxhb_2tx.rbf
+usr/share/usrp/rev2/std_4rx_0tx.rbf
+usr/share/usrp/rev4/multi_2rxhb_2tx.rbf
+usr/share/usrp/rev4/std.ihx
+usr/share/usrp/rev4/std_2rxhb_2tx.rbf
+usr/share/usrp/rev4/std_4rx_0tx.rbf


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst 
(from rev 9889, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postinst)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst        
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst        
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+       exit 0
+fi
+
+# Create usrp group for udev access
+if ! getent group usrp >/dev/null; then
+    addgroup --system usrp
+fi
+
+exit 0


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postinst
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm 
(from rev 9889, 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postrm)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm          
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm  
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "remove" ]; then
+       exit 0
+fi
+
+rm -f /etc/udev/rules.d/40-usrp.rules
+
+exit 0


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.postrm
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev (from 
rev 9889, gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.udev)
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev            
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev    
2008-10-30 21:13:19 UTC (rev 9900)
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", 
GROUP:="usrp", MODE:="0660"


Property changes on: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp.udev
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.dirs

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.install

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postinst

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.postrm

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/libusrp0c2a.udev

Modified: gnuradio/branches/developers/jcorgan/deb-wip/debian/rules
===================================================================
--- gnuradio/branches/developers/jcorgan/deb-wip/debian/rules   2008-10-30 
18:51:18 UTC (rev 9899)
+++ gnuradio/branches/developers/jcorgan/deb-wip/debian/rules   2008-10-30 
21:13:19 UTC (rev 9900)
@@ -82,7 +82,7 @@
        done
 
        : # Deposit rule to allow group 'usrp' access to USRP hardware
-       install -m 0755 -D debian/libusrp0c2a.udev \
+       install -m 0755 -D debian/libusrp.udev \
                debian/tmp/etc/udev/rules.d/40-usrp.rules
 
        dh_install --sourcedir=debian/tmp

Deleted: gnuradio/branches/developers/jcorgan/deb-wip/debian/usrp-firmware.dirs

Deleted: 
gnuradio/branches/developers/jcorgan/deb-wip/debian/usrp-firmware.install

Modified: 
gnuradio/branches/developers/jcorgan/deb-wip/usrp/host/lib/inband/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/deb-wip/usrp/host/lib/inband/Makefile.am   
    2008-10-30 18:51:18 UTC (rev 9899)
+++ 
gnuradio/branches/developers/jcorgan/deb-wip/usrp/host/lib/inband/Makefile.am   
    2008-10-30 21:13:19 UTC (rev 9900)
@@ -32,8 +32,8 @@
        usrp_interface.mbh 
 
 lib_LTLIBRARIES =                      \
-       libusrp_inband.la               \
-       libusrp_inband-qa.la
+       libusrp-inband.la               \
+       libusrp-inband-qa.la
 
 # ------------------------------------------------------------------------
 # Build the inband library
@@ -100,7 +100,7 @@
 libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libusrp_inband_qa_la_LIBADD =          \
-       libusrp_inband.la               \
+       libusrp-inband.la               \
        $(PMT_LA)                       \
        $(CPPUNIT_LIBS)                 \
        -lstdc++
@@ -111,7 +111,7 @@
        test_inband
 
 test_inband_SOURCES = test_inband.cc
-test_inband_LDADD   = libusrp_inband-qa.la
+test_inband_LDADD   = libusrp-inband-qa.la
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc





reply via email to

[Prev in Thread] Current Thread [Next in Thread]