[hamradio-commits] [soapyuhd] 02/02: Add and modify debian/ files based on upstream's

Andreas E. Bombe aeb at moszumanska.debian.org
Wed Oct 26 20:28:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository soapyuhd.

commit fbe77fbf97160d3936b575fe89bcc5284d5c3b10
Author: Andreas Bombe <aeb at debian.org>
Date:   Wed Oct 26 21:20:58 2016 +0200

    Add and modify debian/ files based on upstream's
---
 .gitignore                                     | 16 +++++++-
 debian/changelog                               | 36 ++---------------
 debian/compat                                  |  2 +-
 debian/control                                 | 55 ++++++++++++++++++--------
 debian/copyright                               | 30 +++++++++++++-
 debian/rules                                   |  8 +++-
 debian/{docs => soapysdr0.5-2-module-uhd.docs} |  1 -
 debian/{docs => uhd-soapysdr.docs}             |  1 -
 debian/watch                                   |  2 +
 9 files changed, 95 insertions(+), 56 deletions(-)

diff --git a/.gitignore b/.gitignore
index 796b96d..e2d51fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,15 @@
-/build
+.*.sw[a-p]
+*~
+
+.pc/
+
+debian/.debhelper
+debian/debhelper-build-stamp
+debian/files
+debian/*.debhelper.log
+debian/*.substvars
+
+debian/tmp/
+debian/soapysdr*-module-uhd/
+debian/uhd-soapysdr/
+obj-*/
diff --git a/debian/changelog b/debian/changelog
index 8053fd7..98cd1a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,35 +1,5 @@
-soapyuhd (0.3.1) unstable; urgency=low
+soapyuhd (0.3.1+git20161021-1) unstable; urgency=medium
 
-  * Release 0.3.1 (2016-08-13)
+  * Initial release (Closes: #838313)
 
- -- Josh Blum <josh at pothosware.com>  Sat, 13 Aug 2016 09:28:14 -0700
-
-soapyuhd (0.3.0) unstable; urgency=low
-
-  * Release 0.3.0 (2015-11-20)
-
- -- Josh Blum <josh at pothosware.com>  Fri, 23 Oct 2015 21:01:40 -0700
-
-soapyuhd (0.2.0) unstable; urgency=low
-
-  * Release 0.2.0 (2015-10-10)
-
- -- Josh Blum <josh at pothosware.com>  Sat, 10 Oct 2015 11:16:37 -0700
-
-soapyuhd (0.1.2) unstable; urgency=low
-
-  * Release 0.1.2 (2015-09-13)
-
- -- Josh Blum <josh at pothosware.com>  Sun, 13 Sep 2015 00:01:42 -0700
-
-soapyuhd (0.1.1) unstable; urgency=low
-
-  * Release 0.1.1 (2015-08-15)
-
- -- Josh Blum <josh at pothosware.com>  Sat, 15 Aug 2015 11:32:27 -0700
-
-soapyuhd (0.1.0) unstable; urgency=low
-
-  * Release 0.1.0 (2015-06-15)
-
- -- Josh Blum <josh at pothosware.com>  Mon, 15 Jun 2015 12:29:52 -0400
+ -- Andreas Bombe <aeb at debian.org>  Wed, 26 Oct 2016 21:26:09 +0200
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 0dc0f0e..7e0fe81 100644
--- a/debian/control
+++ b/debian/control
@@ -1,37 +1,58 @@
 Source: soapyuhd
-Section: libs
+Section: hamradio
 Priority: optional
-Maintainer: Josh Blum <josh at pothosware.com>
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Andreas Bombe <aeb at debian.org>
 Build-Depends:
-    debhelper (>= 9.0.0),
+    debhelper (>= 10),
     cmake,
-    libboost-all-dev,
-    libuhd-dev,
-    libsoapysdr-dev
+    libboost-dev, libboost-system-dev, libboost-thread-dev,
+    libsoapysdr-dev,
+    libuhd-dev
 Standards-Version: 3.9.8
 Homepage: https://github.com/pothosware/SoapyUHD/wiki
-Vcs-Git: https://github.com/pothosware/SoapyUHD.git
-Vcs-Browser: https://github.com/pothosware/SoapyUHD
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/soapyuhd.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/soapyuhd.git
 
 Package: soapysdr0.5-2-module-uhd
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy UHD - UHD devices for Soapy SDR.
- A Soapy module that supports UHD devices within the Soapy API.
+Provides: soapysdr0.5-2-module
+Description: UHD device support for SoapySDR
+ Both SoapySDR and the Universal Hardware Driver by Ettus Research projects
+ provide libraries to access various software defined radio hardware through a
+ common interface.
+ .
+ This SoapySDR hardware support module makes all UHD devices available to
+ applications using SoapySDR. An interface in the other direction is available
+ in the uhd-soapysdr package.
 
 Package: soapysdr-module-uhd
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Depends: soapysdr0.5-2-module-uhd, ${misc:Depends}
-Description: Soapy UHD - UHD devices for Soapy SDR.
- A Soapy module that supports UHD devices within the Soapy API.
+Description: UHD device support for SoapySDR (default version)
+ Both SoapySDR and the Universal Hardware Driver by Ettus Research projects
+ provide libraries to access various software defined radio hardware through a
+ common interface.
  .
- This is an empty dependency package that pulls in the USRP module
- for the default version of libsoapysdr.
+ This SoapySDR hardware support module makes all UHD devices available to
+ applications using SoapySDR. An interface in the other direction is available
+ in the uhd-soapysdr package.
+ .
+ This is an empty dependency package that pulls in the UHD module for the
+ default version of libsoapysdr.
 
 Package: uhd-soapysdr
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy UHD - Soapy SDR devices for UHD.
- A UHD module that supports Soapy devices within the UHD API.
+Description: SoapySDR device support for libuhd
+ Both SoapySDR and the Universal Hardware Driver by Ettus Research projects
+ provide libraries to access various software defined radio hardware through a
+ common interface.
+ .
+ This UHD module makes all SoapySDR devices available to applications using
+ libuhd. An interface in the other direction is available in the
+ soapysdr-module-uhd package.
diff --git a/debian/copyright b/debian/copyright
index a8a4e83..0f7a63e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,38 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: soapyuhd
-Source: https://github.com/pothosware/SoapyUHD/wiki
+Source: https://github.com/pothosware/SoapyUHD
 
 Files: *
 Copyright: 2014-2016 Josh Blum <josh at pothosware.com>
 License: GPL-3
+ SPDX-License-Identifier: GPL-3.0
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+
+Files: CMakeLists.txt
+Copyright: 2012-2015 Free Software Foundation, Inc.
+           2015-2016 Josh Blum
+License: GPL-3+
+ This file is part of SoapyUHD support modules
+ .
+ SoapyUHD is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ .
+ SoapyUHD is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with GNU Radio; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street,
+ Boston, MA 02110-1301, USA.
+ .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index 6eb429c..5f621ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEB_HOST_MULTIARCH
 
@@ -8,10 +10,14 @@ export DEB_HOST_MULTIARCH
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --buildsystem=cmake --parallel
+	dh $@ --buildsystem=cmake
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
+override_dh_installdocs:
+	dh_installdocs -p soapysdr-module-uhd --link-doc=soapysdr0.5-2-module-uhd
+	dh_installdocs --remaining-packages
+
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog.txt
diff --git a/debian/docs b/debian/soapysdr0.5-2-module-uhd.docs
similarity index 55%
copy from debian/docs
copy to debian/soapysdr0.5-2-module-uhd.docs
index f9b3f9f..b43bf86 100644
--- a/debian/docs
+++ b/debian/soapysdr0.5-2-module-uhd.docs
@@ -1,2 +1 @@
-COPYING
 README.md
diff --git a/debian/docs b/debian/uhd-soapysdr.docs
similarity index 55%
rename from debian/docs
rename to debian/uhd-soapysdr.docs
index f9b3f9f..b43bf86 100644
--- a/debian/docs
+++ b/debian/uhd-soapysdr.docs
@@ -1,2 +1 @@
-COPYING
 README.md
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1255da7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+https://github.com/pothosware/SoapyUHD/releases .*/soapy-uhd-([\d\.]+)\.tar\.(?:xz|gz|bz2)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapyuhd.git



More information about the pkg-hamradio-commits mailing list