summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-10-20 16:12:25 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-10-20 16:12:25 +0100
commita49f7d7295f90f887445d01086dd9c0ae43e5b3a (patch)
tree6d08ddf76466ea908c7b46953538b26e85c3f399
parent5a32077b555f524654f64a0800c963d6a2fbe64f (diff)
Fix copyright file for GPL-3 and new dates
-rw-r--r--debian/copyright32
1 files changed, 16 insertions, 16 deletions
diff --git a/debian/copyright b/debian/copyright
index 6684776..4d6416c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,27 +3,27 @@ Mon, 8 May 2000 02:57:02 +0200.
It was downloaded from http://www.chiark.greenend.org.uk/~ian/adns/
-Upstream Author: Ian Jackson / ian@chiark.greenend.org.uk
+Upstream Author: Ian Jackson / ijackson@chiark.greenend.org.uk
Copyright:
- adns is Copyright 1997-2000 Ian Jackson, Copyright 1999 Tony Finch, and
- Copyright (C) 1991 Massachusetts Institute of Technology.
+ adns is Copyright 1997-2000,2003,2006,2014 Ian Jackson, Copyright 2014
+ Mark Wooding, Copyright 1999-2000,2003,2006 Tony Finch, and Copyright
+ (C) 1991 Massachusetts Institute of Technology.
- adns is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
+ adns is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
- This program and documentation is distributed in the hope that it will be
- useful, but without any warranty; without even the implied warranty of
- merchantability or fitness for a particular purpose. See the GNU General
- Public License for more details.
+ This program and documentation is distributed in the hope that it will
+ be useful, but without any warranty; without even the implied warranty
+ of merchantability or fitness for a particular purpose. See the [15]GNU
+ General Public License for more details.
You should have received a copy of the GNU General Public License along
- with adns, or one should be available above; if not, write to the Free
- Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA, or email adns-maint@chiark.greenend.org.uk.
+ with adns, or one should be available above; if not, write to the
+ Free Software Foundation or email ijackson@chiark.greenend.org.uk.
-On all Debian systems, a copy of the GNU General Public License (version 2 or
-newer) can be found in `/usr/share/common-licenses/GPL'.
+On all Debian systems, a copy of the GNU General Public License version
+3 can be found in `/usr/share/common-licenses/GPL-3'.