copyright dates, contact details, and similar admin fixes

[chiark-utils.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index cf9d0ffb7c8964453bb35b17b754347a975e480c..ab21ac2ced2e2304f358125ae1d127130258bcc6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,10 +26,13 @@ chiark-named-conf (in the scripts directory) checks and generates
 nameserver configurations.  It is:
  Copyright 2002 Ian Jackson <ian@chiark.greenend.org.uk>
 
+watershed, a tool for optimising runs of idempotent commands, is
+ Copyright 2007 Canonical Ltd
+
 
 The chiark utilities 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,
@@ -38,7 +41,8 @@ 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-licenses/GPL, or with the
-chiark-utils source package as the file COPYING; if not, email me at
-one of the addresses above or write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-3, or
+with the chiark-utils source package as the file COPYING; if not,
+email me at one of the addresses above or consult the Free Software
+Foundation's website at www.fsf.org, or the GNU Project website at
+www.gnu.org.