more package renaming to satisfy soname matching requirement

diff --git a/debian/control b/debian/control
index 021c685937234a5c7d6772f88a17951a41071854..5d30d0895c57efd2a1ea67e5ea586e8760fabe92 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,7 @@ Description: GNU Radio Message Block Library
 # C++ USRP/USRP2 library packages                                              #
 ################################################################################
 
-Package: libusrp-0
+Package: libusrp0
 Section: comm
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -129,7 +129,7 @@ Package: libusrp-dev
 Section: libdevel
 Architecture: any
 Replaces: libusrp0-dev
-Depends: libusrp-0 (= ${binary:Version}), libusb-dev, libboost-thread-dev
+Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread-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
@@ -200,7 +200,7 @@ Description: The GNU Software Radio Core Library
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-audio-alsa
+Package: libgnuradio-audio-alsa0
 Section: libs
 Architecture: any
 Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}
@@ -210,13 +210,13 @@ Description: GNU Radio C++ block for ALSA sound system
 Package: libgnuradio-audio-alsa-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-audio-alsa (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev
+Depends: libgnuradio-audio-alsa0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libasound2-dev
 Description: GNU Radio C++ block for ALSA sound system
  This package contains the ALSA sound system driver for GNU Radio.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-qtgui
+Package: libgnuradio-qtgui0
 Section: libs
 Architecture: any
 Depends: libgnuradio-core0 (= ${binary:Version}), ${shlibs:Depends}
@@ -227,17 +227,17 @@ Description: GNU Radio C++ blocks fro QT-based GUI applications
 Package: libgnuradio-qtgui-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-qtgui (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev
+Depends: libgnuradio-qtgui0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev
 Description: GNU Radio C++ blocks fro QT-based GUI applications
  This package contains the C++ library for using GNU Radio inside
  QT-based GUI applications.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-usrp
+Package: libgnuradio-usrp0
 Section: libs
 Architecture: any
-Depends: libgnuradio-core0 (= ${binary:Version}), libusrp-0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgnuradio-core0 (= ${binary:Version}), libusrp0 (= ${binary:Version}), ${shlibs:Depends}
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
@@ -245,14 +245,14 @@ Description: GNU Radio C++ blocks for USRP(1) hardware
 Package: libgnuradio-usrp-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-usrp (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version})
+Depends: libgnuradio-usrp0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp-dev (= ${binary:Version})
 Description: GNU Radio C++ blocks for USRP(1) hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral.
  .
  This package contains header files needed by developers.
 
-Package: libgnuradio-usrp2
+Package: libgnuradio-usrp2-0
 Section: libs
 Architecture: any
 Depends: libgnuradio-core0 (= ${binary:Version}), libusrp2-0 (= ${binary:Version}), ${shlibs:Depends}
@@ -263,7 +263,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware
 Package: libgnuradio-usrp2-dev
 Section: libdevel
 Architecture: any
-Depends: libgnuradio-usrp2 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version})
+Depends: libgnuradio-usrp2-0 (= ${binary:Version}), libgnuradio-core-dev (= ${binary:Version}), libusrp2-dev (= ${binary:Version})
 Description: GNU Radio C++ blocks for USRP2 hardware
  This package contains the C++ API blocks for the Universal Software Radio
  Peripheral 2.
@@ -276,7 +276,7 @@ Description: GNU Radio C++ blocks for USRP2 hardware
 
 Package: python-usrp
 Architecture: any
-Depends: ${python:Depends}, libusrp-0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${python:Depends}, libusrp0 (= ${binary:Version}), ${shlibs:Depends}
 Provides: ${python:Provides}
 Section: python
 XB-Python-Version: ${python:Versions}
@@ -332,7 +332,7 @@ Description: Python bindings for GNU Radio USRP driver
 
 Package: python-gnuradio-audio-alsa
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa (= ${binary:Version}), python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-audio-alsa0 (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}, python-gnuradio-audio
 XB-Python-Version: ${python:Versions}
@@ -392,7 +392,7 @@ Description: GNU Radio GSM Full-Rate Vocoder
 
 Package: python-gnuradio-qtgui
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui (= ${binary:Version}), python-gnuradio-core
+Depends: ${python:Depends}, ${shlibs:Depends}, libgnuradio-qtgui0 (= ${binary:Version}), python-gnuradio-core
 Section: python
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
@@ -529,7 +529,7 @@ Package: libgnuradio
 Section: libs
 Architecture: all
 Depends: libgnuradio-core0
-Recommends: libgnuradio-audio-alsa, libgnuradio-qtqui, libgnuradio-usrp, libgnuradio-usrp2
+Recommends: libgnuradio-audio-alsa0, libgnuradio-qtqui, libgnuradio-usrp0, libgnuradio-usrp2-0
 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,

diff --git a/debian/gen-install-files.sh b/debian/gen-install-files.sh
index 4df7f022be6f384ac8f656adbaedeb9bd26b73f0..f4e1c7e1398db15ad608f19065f9b8691db0d0e4 100755 (executable)
--- a/debian/gen-install-files.sh
+++ b/debian/gen-install-files.sh
@@ -42,8 +42,8 @@ $EXTRACT gnuradio-core/src/lib/swig/Makefile swiginclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-core.so >>$NAME
 echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME
 
-# libgnuradio-audio-alsa
-NAME=debian/libgnuradio-audio-alsa.install
+# libgnuradio-audio-alsa0
+NAME=debian/libgnuradio-audio-alsa0.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME
@@ -59,8 +59,8 @@ $EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-audio-alsa.so >>$NAME
 echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$NAME
 
-# libgnuradio-qtgui
-NAME=debian/libgnuradio-qtgui.install
+# libgnuradio-qtgui0
+NAME=debian/libgnuradio-qtgui0.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES >>$NAME
@@ -74,14 +74,14 @@ touch $NAME
 $EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-qtgui.so >>$NAME
 
-# libgnuradio-usrp
-NAME=debian/libgnuradio-usrp.install
+# libgnuradio-usrp0
+NAME=debian/libgnuradio-usrp0.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME
 $EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES | \
     sed -e 's/\.la$/.so.*/' >>$NAME
-echo usr/lib/pkgconfig/gnuradio-usrp.pc >> $NAME
+echo usr/lib/pkgconfig/gnuradio-usrp0.pc >> $NAME
 
 # libgnuradio-usrp-dev
 NAME=debian/libgnuradio-usrp-dev.install
@@ -90,14 +90,14 @@ touch $NAME
 $EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-usrp.so >>$NAME
 
-# libgnuradio-usrp2
-NAME=debian/libgnuradio-usrp2.install
+# libgnuradio-usrp2-0
+NAME=debian/libgnuradio-usrp2-0.install
 rm -f $NAME
 touch $NAME
 $EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME
 $EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES | \
     sed -e 's/\.la$/.so.*/' >>$NAME
-echo usr/lib/pkgconfig/gnuradio-usrp2.pc >> $NAME
+echo usr/lib/pkgconfig/gnuradio-usrp2-0.pc >> $NAME
 
 # libgnuradio-usrp2-dev
 NAME=debian/libgnuradio-usrp2-dev.install

diff --git a/debian/libusrp-0.dirs b/debian/libusrp-0.dirs
deleted file mode 100644 (file)
index cb9eb42..0000000
--- a/debian/libusrp-0.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/udev/rules.d
-/usr/share/usrp/rev2
-/usr/share/usrp/rev4

diff --git a/debian/libusrp-0.install b/debian/libusrp-0.install
deleted file mode 100644 (file)
index 1cabb1f..0000000
--- a/debian/libusrp-0.install
+++ /dev/null
@@ -1,11 +0,0 @@
-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

diff --git a/debian/libusrp-0.postinst b/debian/libusrp-0.postinst
deleted file mode 100644 (file)
index 562b923..0000000
--- a/debian/libusrp-0.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /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
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/libusrp-0.udev b/debian/libusrp-0.udev
deleted file mode 100644 (file)
index e45dc29..0000000
--- a/debian/libusrp-0.udev
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660"

diff --git a/debian/libusrp0.dirs b/debian/libusrp0.dirs
new file mode 100644 (file)
index 0000000..cb9eb42
--- /dev/null
+++ b/debian/libusrp0.dirs
@@ -0,0 +1,3 @@
+etc/udev/rules.d
+/usr/share/usrp/rev2
+/usr/share/usrp/rev4

diff --git a/debian/libusrp0.install b/debian/libusrp0.install
new file mode 100644 (file)
index 0000000..1cabb1f
--- /dev/null
+++ b/debian/libusrp0.install
@@ -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

diff --git a/debian/libusrp0.postinst b/debian/libusrp0.postinst
new file mode 100644 (file)
index 0000000..562b923
--- /dev/null
+++ b/debian/libusrp0.postinst
@@ -0,0 +1,16 @@
+#! /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
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/libusrp0.udev b/debian/libusrp0.udev
new file mode 100644 (file)
index 0000000..e45dc29
--- /dev/null
+++ b/debian/libusrp0.udev
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660"

diff --git a/debian/rules b/debian/rules
index 035fb9015d29646b0d132c5a1eaeb9cd9437bcae..3a4b1692ca0ddd75ea2dde5851df8ee1376edf98 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ install-stamp: extract-stamp debian/control
        done
 
        : # Deposit rule to allow group 'usrp' access to USRP hardware
-       install -m 0644 -D debian/libusrp-0.udev \
+       install -m 0644 -D debian/libusrp0.udev \
                debian/tmp/etc/udev/rules.d/40-usrp.rules
 
        : # Deposit rule to allow group 'usrp' access to USRP2 hardware