X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=debian%2Fcopyright;h=37bb1961dd69e51fc3fffaecb1a8b2f32ee9767e;hp=5d382b8faaf58973f1699d84c5b44d527c83426e;hb=30cbd6a4e31c37e9726f1d6f1eaab7a60ba7aa76;hpb=db5696823d6abba12e90152edf0c2cf174d22c5b

diff --git a/debian/copyright b/debian/copyright
index 5d382b8..37bb196 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,10 +26,64 @@ 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
+
+xbatmon-simple, a simple X client for displaying ACPI battery status
+ Copyright 2004,2012 Ian Jackson <ian@chiark.greenend.org.uk>
+
+xduplic-copier, a simple X client for typing into multiple windows
+ Copyright 2002,2013 Ian Jackson <ian@chiark.greenend.org.uk>
+
+git-cache-proxy, a rather shoddy daemon for speeding up git clone
+ Copyright 2013 Ian Jackson <ian@chiark.greenend.org.uk>
+
+summer, a tool for reporting complete details about a filesystem tree
+ Copyright 2003-2007 Ian Jackson <ian@chiark.greenend.org.uk>
+ manpage Copyright 2006 Peter Maydell <pmaydell@chiark.greenend.org.uk>
+
+cvs-repomove and cvs-adjustroot: tools for moving CVS repositories
+ Copyright 2004-2006 Ian Jackson <ian@chiark.greenend.org.uk>
+
+cvsweb-list: cgi program to list ucgi (userv-utils) cvsweb repos
+ Copyright 2001 Ian Jackson <ian@chiark.greenend.org.uk>
+
+expire-iso8601: keeps or expires backup trees named after their dates
+ Copyright 2006 Ian Jackson <ian@chiark.greenend.org.uk>
+
+gnucap2genspic, ngspice2genspic, genspic2gnuplot:
+Tools for converting gnucap files and ngspice output files to
+genspic and genspic files to gnuplot input so they can be plotted.
+ Copyright 2004 Ian Jackson <ian@chiark.greenend.org.uk>
+
+hexterm: connect to serial port and interact in ASCII and hex (hex terminal)
+ Copyright 2005 Ian Jackson <ian@chiark.greenend.org.uk>
+ 
+palm-datebook-reminders: for mailing reminders about Palm PDA appointments
+ Copyright 2003 Ian Jackson <ian@chiark.greenend.org.uk>
+
+acctdump: for reading process acounting files
+ Copyright 1998,2001,2006 Ian Jackson <ian@chiark.greenend.org.uk>
+
+random-word, remountresizereiserfs, summarise-mailbox-preserving-privacy
+ Miscellaneous utilities.
+ Copyright 2004,2006 Ian Jackson <ian@chiark.greenend.org.uk>
+
+nntpid
+ Utility for finding usenet articles by messageid from an NNTP server
+ Copyright -2011 Simon Tatham
+ Copyright 2011 Richard Kettlewell
+ Copyright 2011 Colin Watson
+ Copyright 2011 Ian Jackson
+ Dual licence MIT/GPL3+
+
+git-cache-proxy
+ Copyright 2010 Tony Finch
+ Copyright 2013,2014 Ian Jackson
 
 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 +92,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/doc/copyright/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.