update d/copyright for GPL-2+ -> GPL-3+ & add git-daemon/ info

[userv-utils.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index f2f12ab4fc5fac4b652a0dedf22cd2843031a585..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,9 +23,15 @@ 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 Ian Jackson <ijackson@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>