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

Andreas E. Bombe aeb at moszumanska.debian.org
Thu Oct 20 00:55:49 UTC 2016


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

aeb pushed a commit to branch master
in repository soapyremote.

commit 1743f4a8418469fc960748631412c61cba0c7eac
Author: Andreas Bombe <aeb at debian.org>
Date:   Thu Oct 20 02:43:23 2016 +0200

    Add and modify debian/ files based on upstream's
    
    Also adds systemd service file based on upstream git and a man page for
    SoapySDRServer.
---
 .gitignore                                         | 16 ++++++++
 debian/SoapySDRServer.1                            | 39 +++++++++++++++++++
 debian/changelog                                   | 30 ++-------------
 debian/compat                                      |  2 +-
 debian/control                                     | 45 ++++++++++++++--------
 debian/copyright                                   |  4 +-
 debian/rules                                       | 12 +++++-
 debian/{docs => soapyremote-server.docs}           |  0
 ...r-server.install => soapyremote-server.install} |  0
 debian/soapyremote-server.manpages                 |  1 +
 debian/soapyremote-server.service                  | 12 ++++++
 debian/{docs => soapysdr0.5-2-module-remote.docs}  |  0
 debian/watch                                       |  2 +
 13 files changed, 115 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..543bd1f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.*.sw[a-p]
+*~
+
+.pc/
+
+debian/.debhelper
+debian/debhelper-build-stamp
+debian/files
+debian/*.debhelper
+debian/*.debhelper.log
+debian/*.substvars
+
+debian/tmp/
+debian/soapysdr*-module-remote/
+debian/soapyremote-server/
+obj-*/
diff --git a/debian/SoapySDRServer.1 b/debian/SoapySDRServer.1
new file mode 100644
index 0000000..cd2ff8b
--- /dev/null
+++ b/debian/SoapySDRServer.1
@@ -0,0 +1,39 @@
+.\" SoapySDRServer.1 - manpage for SoapySDRServer
+.\"
+.\"
+.TH SOAPYSDRSERVER 1 2016\-10\-11 "SoapyRemote 0.3.1"
+.SH NAME
+\fBSoapySDRServer\fR \- provide access to local SoapySDR devices over network
+.\" ----------------------------------------------------------------------------
+.SH SYNOPSIS
+\fBSoapySDRServer\fR [\fIOPTIONS\fR]
+.\" ----------------------------------------------------------------------------
+.SH DESCRIPTION
+SoapySDRServer is a server that exports all locally available SoapySDR devices
+over the network.
+On the other side, a SoapyRemote module for SoapySDR connects to this server and
+provides the server's modules locally.
+.\" ----------------------------------------------------------------------------
+.SH OPTIONS
+.TP
+\fB\-\-bind\fR[=\fIIP\fR[:\fIPORT\fR]]
+Run server.
+If an \fIIP\fR argument is not given, bind to the default port 55132 on all
+local network addresses.
+\fIIP\fR is the IPv4 or IPv6 address to bind to.
+If the either of the special values "0.0.0.0" or "[::]" for \fIIP\fR is given
+it will bind to all local addresses.
+\fIPORT\fR is an optional port number to use instead of the default.
+.TP
+\fB\-\-help\fR
+Display help and exit.
+.\" ----------------------------------------------------------------------------
+.SH HOMEPAGE
+SoapySDRServer is part of the
+.UR https://github.com/pothosware/SoapyRemote/wiki
+SoapyRemote project
+.UE .
+.\" ----------------------------------------------------------------------------
+.SH AUTHORS
+The SoapyRemote client and server were written by Josh Blum and Bastille
+Networks.
diff --git a/debian/changelog b/debian/changelog
index c46379c..035331a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,5 @@
-soapyremote (0.3.1) unstable; urgency=low
+soapyremote (0.3.1-1) unstable; urgency=medium
 
-  * Release 0.3.1 (2016-09-01)
+  * Initial release. (Closes: #838314)
 
- -- Josh Blum <josh at pothosware.com>  Thu, 01 Sep 2016 21:02:42 -0700
-
-soapyremote (0.3.0) unstable; urgency=low
-
-  * Release 0.3.0 (2016-07-10)
-
- -- Josh Blum <josh at pothosware.com>  Sun, 10 Jul 2016 16:48:12 -0700
-
-soapyremote (0.2.1) unstable; urgency=low
-
-  * Release 0.2.1 (2016-04-21)
-
- -- Josh Blum <josh at pothosware.com>  Thu, 21 Apr 2016 14:50:37 -0400
-
-soapyremote (0.2.0) unstable; urgency=low
-
-  * Release 0.2.0 (2015-11-21)
-
- -- Josh Blum <josh at pothosware.com>  Thu, 15 Oct 2015 19:29:23 -0700
-
-soapyremote (0.1.0) unstable; urgency=low
-
-  * Release 0.1.0 (2015-10-10)
-
- -- Josh Blum <josh at pothosware.com>  Sat, 10 Oct 2015 11:08:35 -0700
+ -- Andreas Bombe <aeb at debian.org>  Thu, 20 Oct 2016 02:42:10 +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 16c85cc..64a24d1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,35 +1,46 @@
 Source: soapyremote
-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,
-    libsoapysdr-dev (>= 0.3.0)
+    libsoapysdr-dev
 Standards-Version: 3.9.8
 Homepage: https://github.com/pothosware/SoapyRemote/wiki
-Vcs-Git: https://github.com/pothosware/SoapyRemote.git
-Vcs-Browser: https://github.com/pothosware/SoapyRemote
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/soapyremote.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/soapyremote.git
 
 Package: soapysdr0.5-2-module-remote
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy Remote - Remote device support for Soapy SDR.
- A Soapy module that supports remote devices within the Soapy API.
+Provides: soapysdr0.5-2-module
+Description: Use SoapySDR devices over network (client module)
+ The SoapyRemote project provides a client module and a server that make it
+ possible on the client side to list and access hardware supported by SoapySDR
+ modules on the server as if they were local modules.
+ .
+ This package contains the client module.
 
 Package: soapysdr-module-remote
-Architecture: all
+Architecture: any
 Depends: soapysdr0.5-2-module-remote, ${misc:Depends}
-Description: Soapy Remote - Remote device support for Soapy SDR.
- A Soapy module that supports remote devices within the Soapy API.
+Description: Use SoapySDR devices over network (default client module)
+ The SoapyRemote project provides a client module and a server that make it
+ possible on the client side to list and access hardware supported by SoapySDR
+ modules on the server as if they were local modules.
  .
- This is an empty dependency package that pulls in the remote module
- for the default version of libsoapysdr.
+ This is an empty dependency package that pulls in the client module for the
+ default version of libsoapysdr.
 
-Package: soapysdr-server
-Section: libs
+Package: soapyremote-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy Remote - Remote device support for Soapy SDR.
- The SoapySDRServer server application for remote devices.
+Description: Use SoapySDR devices over network (server)
+ The SoapyRemote project provides a client module and a server that make it
+ possible on the client side to list and access hardware supported by SoapySDR
+ modules on the server as if they were local modules.
+ .
+ This package contains the server.
diff --git a/debian/copyright b/debian/copyright
index 372433f..0f66acc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Source: https://github.com/pothosware/SoapyRemote/wiki
 
 Files: *
 Copyright:
-    Copyright (c) 2015-2016 Josh Blum <josh at pothosware.com>
-    Copyright (c) 2016-2016 Bastille Networks
+    Copyright (c) 2015-2016 Josh Blum
+    Copyright (c) 2016 Bastille Networks
 License: BSL-1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .
diff --git a/debian/rules b/debian/rules
index 6eb429c..ebd017e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,9 @@
 #!/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
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -13,5 +14,14 @@ export DEB_HOST_MULTIARCH
 override_dh_auto_configure:
 	dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
+override_dh_installinit:
+	# installinit creates init.d snippets even though only a systemd
+	# unit file is installed; disable and let dh_systemd do the work
+
+override_dh_installdocs:
+	dh_installdocs -p soapysdr-module-remote \
+		--link-doc=soapysdr0.5-2-module-remote
+	dh_installdocs --remaining-packages
+
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog.txt
diff --git a/debian/docs b/debian/soapyremote-server.docs
similarity index 100%
copy from debian/docs
copy to debian/soapyremote-server.docs
diff --git a/debian/soapysdr-server.install b/debian/soapyremote-server.install
similarity index 100%
rename from debian/soapysdr-server.install
rename to debian/soapyremote-server.install
diff --git a/debian/soapyremote-server.manpages b/debian/soapyremote-server.manpages
new file mode 100644
index 0000000..aae1e73
--- /dev/null
+++ b/debian/soapyremote-server.manpages
@@ -0,0 +1 @@
+debian/SoapySDRServer.1
diff --git a/debian/soapyremote-server.service b/debian/soapyremote-server.service
new file mode 100644
index 0000000..2d220d9
--- /dev/null
+++ b/debian/soapyremote-server.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SoapyRemote server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/SoapySDRServer --bind
+KillMode=process
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
+Alias=SoapySDRServer.service
diff --git a/debian/docs b/debian/soapysdr0.5-2-module-remote.docs
similarity index 100%
rename from debian/docs
rename to debian/soapysdr0.5-2-module-remote.docs
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..cb271a0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+https://github.com/pothosware/SoapyRemote/releases .*/soapy-remote-([\d\.]+)\.tar\.(?:xz|gz|bz2)

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



More information about the pkg-hamradio-commits mailing list