chasing lintian complaints

diff --git a/debian/control b/debian/control
index 237c647a2afed4a1088de7311b3659fbceac5386..1c73d92e9ea6261243153f9dc4566046069b5e39 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ XS-Python-Version: >=2.5
 Package: libgruel0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio Utility Etcetera Library
  This package implements a variety of low-level utility
  routines for GNU Radio.
@@ -26,7 +26,7 @@ Description: GNU Radio Utility Etcetera Library
 Package: libgruel-dev
 Section: libdevel
 Architecture: any
-Depends: libgruel0 (= ${binary:Version})
+Depends: libgruel0 (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Utility Etcetera Library
  This package implements a variety of low-level utility
  routines for GNU Radio.
@@ -38,7 +38,7 @@ Section: libs
 Architecture: any
 Replaces: libgnuradio-omnithread0c2a
 Conflicts: libgnuradio-omnithread0c2a
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
@@ -48,7 +48,7 @@ Section: libdevel
 Architecture: any
 Replaces: libgnuradio-omnithread0-dev
 Conflicts: libgnuradio-omnithread0-dev
-Depends: libgromnithread0 (= ${binary:Version})
+Depends: libgromnithread0 (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Omnithreads Abstraction Library
  This package is a fork of the omniORB-4.0.1 threading library
  for use with GNU Radio.
@@ -60,7 +60,7 @@ Section: libs
 Architecture: any
 Replaces: libpmt0c2a
 Conflicts: libpmt0c2a
-Depends: libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
@@ -71,7 +71,7 @@ Section: libdevel
 Architecture: any
 Replaces: libpmt0-dev
 Conflicts: libpmt0-dev
-Depends: libpmt0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version})
+Depends: libpmt0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Polymorphic Type Library
  This package implements polymorphic types.  These are similar 
  to lisp or Python data objects, and implement transparent
@@ -88,7 +88,7 @@ Section: libs
 Architecture: any
 Replaces: libmblock0c2a
 Conflicts: libmblock0c2a
-Depends: libpmt0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, guile-1.8
+Depends: libpmt0 (= ${binary:Version}), libgromnithread0 (= ${binary:Version}), ${shlibs:Depends}, guile-1.8, ${misc:Depends}
 Description: GNU Radio Message Block Library 
  This package provides the GNU Radio message block library. 
 
@@ -97,7 +97,7 @@ Section: libdevel
 Architecture: any
 Replaces: libmblock0-dev
 Conflicts: libmblock0-dev
-Depends: libmblock0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libpmt-dev (= ${binary:Version})
+Depends: libmblock0 (= ${binary:Version}), libgromnithread-dev (= ${binary:Version}), libpmt-dev (= ${binary:Version}), ${misc:Depends}
 Description: GNU Radio Message Block Library
  This package provides the GNU Radio message block library.
  .
@@ -110,7 +110,7 @@ Description: GNU Radio Message Block Library
 Package: libusrp0
 Section: comm
 Architecture: any
-Depends: ${shlibs:Depends}, adduser
+Depends: ${shlibs:Depends}, adduser, ${misc:Depends}
 Replaces: libusrp0c2a, usrp-firmware
 Conflicts: usrp-firmware
 Suggests: usrp-doc
@@ -129,7 +129,7 @@ Package: libusrp-dev
 Section: libdevel
 Architecture: any
 Replaces: libusrp0-dev
-Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread-dev
+Depends: libusrp0 (= ${binary:Version}), libusb-dev, libboost-thread-dev, ${misc:Depends}
 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
@@ -509,6 +509,7 @@ Description: The GNU Radio Companion
 Package: gnuradio-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Software Defined Radio
  This package contains the documentation for the GNU Radio software
  defined radio system.
@@ -516,6 +517,7 @@ Description: Software Defined Radio
 Package: usrp-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Software Defined Radio
  This package contains the documentation for the Universal Software Radio
  Peripheral (USRP) hardware and interface library.
@@ -560,7 +562,7 @@ Description: Python Libraries for GNU Radio Components
 Package: gnuradio-apps
 Section: comm
 Architecture: all
-Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder, gnuradio-radio-astronomy, gnuradio-radar-mono
+Depends: gnuradio-gpio, gnuradio-pager, gnuradio-sounder, gnuradio-radio-astronomy, gnuradio-radar-mono, ${misc:Depends}
 Description: The GNU Software Radio Toolkit - applications
  This is a virtual package that depends on top-level GNU Radio application
  packages.
@@ -568,6 +570,7 @@ Description: The GNU Software Radio Toolkit - applications
 Package: gnuradio
 Section: comm
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: libgnuradio, libgnuradio-dev, gnuradio-doc, python-gnuradio, gnuradio-utils, gnuradio-examples, gnuradio-apps
 Description: The GNU Software Radio Toolkit
  This is a virtual package that installs the entire GNU Radio and USRP software

diff --git a/debian/libusrp0.dirs b/debian/libusrp0.dirs
index cb9eb4204072b03719f36754aa25fe988ca4645e..964c75fd9d98b2d591756808b5f00890cb8db94e 100644 (file)
--- a/debian/libusrp0.dirs
+++ b/debian/libusrp0.dirs
@@ -1,3 +1,3 @@
-etc/udev/rules.d
-/usr/share/usrp/rev2
-/usr/share/usrp/rev4
+lib/udev/rules.d
+usr/share/usrp/rev2
+usr/share/usrp/rev4

diff --git a/debian/libusrp0.install b/debian/libusrp0.install
index 1cabb1ff471978b008fa2450a429ec638364fe99..c051174c4f5560a3471ab18f5557ef3fd720c657 100644 (file)
--- a/debian/libusrp0.install
+++ b/debian/libusrp0.install
@@ -1,6 +1,6 @@
 usr/lib/libusrp.la
 usr/lib/libusrp.so.*
-etc/udev/rules.d/40-usrp.rules
+lib/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

diff --git a/debian/rules b/debian/rules
index d6a2ebecaba9119f072b38c58e309d9f25ddbe3a..b9c92f080d96fe0ab32dde5a84784d806936ef74 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ install-stamp: extract-stamp debian/control
 
        : # Deposit rule to allow group 'usrp' access to USRP hardware
        install -m 0644 -D debian/libusrp0.udev \
-               debian/tmp/etc/udev/rules.d/40-usrp.rules
+               debian/tmp/lib/udev/rules.d/40-usrp.rules
 
        : # Deposit rule to allow group 'usrp' access to USRP2 hardware
        install -m 0644 -D debian/libusrp2-0.limits \