summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2021-08-04 22:38:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2021-08-04 22:38:02 +0100
commit6c46c4d447bddd5e0b307af8677bf4bf25443639 (patch)
tree7a68e0e5424750040e35455888c07cfe7fca9ace
parent6a5535e177aefb1e36115fa0eb775444eb3e3267 (diff)
parentc44ef57903ad29418b7d0b0a325524e7b6eb341b (diff)
downloaduserv-utils-6c46c4d447bddd5e0b307af8677bf4bf25443639.tar.gz
Merge remote-tracking branch 'spwhitton/master'
-rw-r--r--debian/compat1
-rw-r--r--debian/control8
-rw-r--r--debian/copyright12
3 files changed, 14 insertions, 7 deletions
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
index 0e36df1..0c2da9f 100644
--- 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 4660a2d..ea715a5 100644
--- 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>