Merge remote-tracking branch 'spwhitton/master'

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 45a4fb7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8

diff --git a/debian/control b/debian/control
index 0e36df14c7bf40e4c065285a46888c9dd66f6c61..0c2da9fbc85b53eb2945eab7841cb8f2d7c5c0e9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,11 @@
 Source: userv-utils
 Section: admin
-Priority: extra
-Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Priority: optional
+Maintainer: Sean Whitton <spwhitton@spwhitton.name>
+Uploaders: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Build-Depends: debhelper-compat (= 13), rename
 Standards-Version: 3.7.0.0
-Build-Depends: debhelper (>= 8)
+Rules-Requires-Root: binary-targets
 
 Package: userv-utils
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 4660a2d6d7567bdefd616afc34f2ece020753438..ea715a5ae088f0506280282a603e93143e638e01 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,14 @@ with the `userv' security boundary tool.
 
 This package, containing the moderately portable sources and Debian
 packaging information, and the resulting Debian binary packages, was
-put together by Ian Jackson.  For both upstream and Debian packaging
-questions, please contact userv-utils@chiark.greenend.org.uk.
+put together by Ian Jackson and Sean Whitton.  For both upstream and
+Debian packaging questions, please contact
+userv-discuss@chiark.greenend.org.uk.
 
 
 userv and userv-utils are all free software; you can redistribute them
 and/or modify them under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2 of the
+as published by the Free Software Foundation; either version 3 of the
 License, or (at your option) any later version.
 
 These programs are distributed in the hope that they will be useful,
@@ -22,6 +23,11 @@ your Debian GNU/Linux system, in /usr/share/common-licenses/GPL.
 If not, see <http://www.gnu.org/licenses/>.
 
 
+The utilities and programs under the git-daemon/ subdirectory are
+dedicated to the public domain by means of the CC0 1.0 public domain
+dedication; see /usr/share/common-licenses/CC0-1.0 on Debian systems.
+
+
 userv-utils are
 Copyright 1996-2013,2016 Ian Jackson <ijackson@chiark.greenend.org.uk>
 Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>