X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=debian%2Fcopyright;h=0ba5fd85587be6a7377b26a6e28cd3a34131680b;hb=d9d8b1a736946ae91c521133dc32d5e1d6b5e506;hp=5d382b8faaf58973f1699d84c5b44d527c83426e;hpb=db5696823d6abba12e90152edf0c2cf174d22c5b;p=chiark-utils.git diff --git a/debian/copyright b/debian/copyright index 5d382b8..0ba5fd8 100644 --- 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 +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,7 @@ 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 to the Free Software +Foundation's GNU Project website http://www.gnu.org/