From 470a1ca3828655b9b61ed5ce586f473bacd84c73 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 19 Sep 2018 11:59:43 -0700
Subject: debian: Update control files for .deb files

- Better alignement with public Debian files.
- Move to a different package name: libuhd003.so -> libuhd3.13.0.so
  This allows to install multiple packages in parallel for better ABI
  compatibility by third-party dependees. The new package replaces the
  old one.
- Remove .shlibs file
---
 host/cmake/debian/control              | 47 ++++++++++++++++++++--------------
 host/cmake/debian/libuhd003.install    |  2 --
 host/cmake/debian/libuhd003.shlibs     |  1 -
 host/cmake/debian/libuhd3.13.0.install |  2 ++
 host/cmake/debian/watch                |  2 +-
 5 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 host/cmake/debian/libuhd003.install
 delete mode 100644 host/cmake/debian/libuhd003.shlibs
 create mode 100644 host/cmake/debian/libuhd3.13.0.install

(limited to 'host/cmake')

diff --git a/host/cmake/debian/control b/host/cmake/debian/control
index c0bcb3620..fc53a929e 100644
--- a/host/cmake/debian/control
+++ b/host/cmake/debian/control
@@ -3,34 +3,41 @@ Section: science
 Priority: optional
 Maintainer: Ettus Research <packages@ettus.com>
 Uploaders: Martin Braun <martin.braun@ettus.com>
-Build-Depends:  debhelper (>= 9),
-                cmake (>= 2.8.4+dfsg.1-3),
-                python-dev,
-                python-mako, 
+Build-Depends:  cmake,
+                debhelper (>= 9),
                 doxygen,
-                libusb-1.0-0-dev [linux-any],
-                libusb2-dev [kfreebsd-any],
-                libncurses5-dev,
-                pkg-config,
-                libboost-dev,
                 libboost-date-time-dev,
+                libboost-dev,
                 libboost-filesystem-dev,
                 libboost-program-options-dev,
+                libboost-python-dev,
                 libboost-regex-dev,
+                libboost-serialization-dev,
                 libboost-system-dev,
-                libboost-thread-dev,
                 libboost-test-dev,
-                libboost-serialization-dev
+                libboost-thread-dev,
+                libncurses5-dev,
+                libusb-1.0-0-dev [linux-any],
+                libusb2-dev [kfreebsd-any],
+                pkg-config,
+                python-dev,
+                python-mako,
+                python-requests
 Standards-Version: 3.9.7
 Homepage: https://www.ettus.com
 Vcs-Git: git://github.com/EttusResearch/uhd.git
 
 Package: uhd-host
 Architecture: any
-Depends: libuhd003, python, adduser, python-requests, ${shlibs:Depends}, ${misc:Depends}
-Recommends: python-tk, curl, procps
+Depends: adduser,
+         libuhd3.14.0 (= ${binary:Version}),
+         python,
+         python-requests,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: curl, procps, python-tk
 Suggests: gnuradio
-Description: hardware driver for Ettus Research products
+Description: hardware driver for Ettus Research products - host apps
  Host utilities for the USRP Hardware Driver for Ettus Research products.
  .
  The supported devices provide analog radio receiver and transmitter hardware
@@ -38,15 +45,17 @@ Description: hardware driver for Ettus Research products
  defined radio running on the host computer.
  .
  This package includes the uhd_find_devices application to locate and
- configure attached peripherals, and the uhd_usrp_probe application to
- display hardware configuration information.
+ configure attached peripherals, the uhd_usrp_probe application to
+ display hardware configuration information, and Doxygen generated
+ documentation.
 
-Package: libuhd003
+Package: libuhd3.14.0
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: python, adduser, ${shlibs:Depends}, ${misc:Depends}
 Suggests: gnuradio
+Replaces: libuhd003
 Multi-Arch: same
 Description: hardware driver for Ettus Research products
  Host library for the USRP Hardware Driver for Ettus Research products.
@@ -58,8 +67,8 @@ Description: hardware driver for Ettus Research products
 Package: libuhd-dev
 Architecture: any
 Section: libdevel
-Depends: libuhd003 (= ${binary:Version}), python, adduser, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libjs-jquery, gnuradio
+Depends: libuhd3.14.0 (= ${binary:Version}), python, ${misc:Depends}, ${shlibs:Depends}
+Suggests: gnuradio
 Description: universal hardware driver for Ettus Research products
  Host library for the USRP Hardware Driver for Ettus Research products.
  .
diff --git a/host/cmake/debian/libuhd003.install b/host/cmake/debian/libuhd003.install
deleted file mode 100644
index b13e00bd7..000000000
--- a/host/cmake/debian/libuhd003.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/uhd
diff --git a/host/cmake/debian/libuhd003.shlibs b/host/cmake/debian/libuhd003.shlibs
deleted file mode 100644
index 2d5028dd4..000000000
--- a/host/cmake/debian/libuhd003.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libuhd 003 libuhd003
diff --git a/host/cmake/debian/libuhd3.13.0.install b/host/cmake/debian/libuhd3.13.0.install
new file mode 100644
index 000000000..b13e00bd7
--- /dev/null
+++ b/host/cmake/debian/libuhd3.13.0.install
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/share/uhd
diff --git a/host/cmake/debian/watch b/host/cmake/debian/watch
index 9e79c82aa..4cabdbdb5 100644
--- a/host/cmake/debian/watch
+++ b/host/cmake/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=uversionmangle=s/([^0-9]|)0*(\d)/$1$2/g;s/_/./g \
-https://github.com/EttusResearch/uhd/tags .*/release_([\d_]+)\.tar\..*
+https://github.com/EttusResearch/uhd/tags (?:.*?/)?(v[\d]+.[\d]+.[\d]+.[\d]+).tar.gz
-- 
cgit v1.2.3