d/copyright: state from where sources were obtained

[userv-utils.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 6ed93c2c751dc6b72fc0da930d19ffd28bfda3ed..36f5bacd6421381dadfa002391a570b6a9a71a02 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,17 @@
 This package contains a number of small utilities and programs for use
-with the `userv' security boundary tool.
+with the `userv' security boundary tool, obtained from
+<https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=summary>.
 
 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,
@@ -18,10 +20,19 @@ 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 with
-your Debian GNU/Linux system, in /usr/share/common-licences/GPL.
+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 (C)1996-2000,2003 Ian Jackson <ian@davenant.greenend.org.uk>.
-Copyright (C)1998 David Damerell <damerell@chiark.greenend.org.uk>
+Copyright 1996-2013,2016 Ian Jackson <ijackson@chiark.greenend.org.uk>
+Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+Copyright 1999,2003
+   Chancellor Masters and Scholars of the University of Cambridge
+Copyright 2010 Tony Finch <fanf@dotat.at>
+Copyright 2013,2016 Mark Wooding <mdw@distorted.org.uk>