debian/copyright file improved; named-conf script has copyright notice at top

diff --git a/debian/changelog b/debian/changelog
index 5bca7a4dee27b8c90253ca2876085cb1b5d07f73..74e5e6f99ddc9f28fbd83fa43d1b74a96c9b5609 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ chiark-utils (3.0.0) unstable; urgency=low
   * Copyright notices sorted out.
   * sync-accounts.linux uses vipw, vigr.
   * Removed sync-accounts-mktar (eewwgh).
+  * Makefile and Debian control stuff added.
+
+  Other changes:
+  * debian/copyright file improved.
+  * named-conf script has copyright notice at top.
 
  --
 

diff --git a/debian/copyright b/debian/copyright
index 3a1ca6909c2d9e55e57161b8d2fefdb2ac2411a5..5d382b8faaf58973f1699d84c5b44d527c83426e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,12 +11,20 @@ chiark-utils-maint@chiark.greenend.org.uk.
 The software included is:
 
 chiark backup, for small systems or networks.  chiark backup is
- Copyright (C) 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
- Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
+ Copyright 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+ Copyright 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
 readbuffer/writebuffer (in the backup directory), filters for keeping
 tape drives streaming and audio output devices playing.  They are:
- Copyright (C) 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+ Copyright 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+
+sync-accounts, a tool for synchronising UN*X password data.  It's
+ Copyright 1999-2000,2002 Ian Jackson <ian@davenant.greenend.org.uk>
+ Copyright 2000-2001 nCipher Corporation Ltd
+
+chiark-named-conf (in the scripts directory) checks and generates
+nameserver configurations.  It is:
+ Copyright 2002 Ian Jackson <ian@chiark.greenend.org.uk>
 
 
 The chiark utilities are all free software; you can redistribute them

diff --git a/scripts/named-conf b/scripts/named-conf
index 6ec87cbc5811e0fb2ca64938753710c8325e26fc..8ce3e61c5e009af13289a3c9607670686f482c58 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -1,4 +1,19 @@
 #!/usr/bin/perl -w
+# This is chiark-named-conf, which is Copyright 2002 Ian Jackson.
+#
+# chiark-named-conf and its manpage are free software; you can
+# redistribute it and/or modify them under the terms of the GNU
+# General Public License as published by the Free Software Foundation;
+# either version 2, or (at your option) any later version.
+# 
+# chiark-named-conf and its manpage are 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.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 use strict;
 use IO::File;