copyright dates, contact details, and similar admin fixes

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index fb72f586717c922a6560276e3e99076cc3574fb2..cbbe6f4619b5612f248eb86cc70289ed6ab773dc 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -19,8 +19,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 require IO::File;
 

diff --git a/backup/bringup b/backup/bringup
index a9fc54c81d4814d9dcafa7427561c82a5c6da030..b88a7200959bea52f4847d7bc32f2a980f17af5c 100755 (executable)
--- a/backup/bringup
+++ b/backup/bringup
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # Very simple: extract the default runlevel from /etc/inittab
 # and change to it with telinit.

diff --git a/backup/checkallused b/backup/checkallused
index b442d2573d4735e56d8fef12f901a2fb1fefbb38..c0079d08bb726d4b4faa33fb4cab736ca2af23ea 100755 (executable)
--- a/backup/checkallused
+++ b/backup/checkallused
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # All filesystems must either be backed up in both full and
 # incremental dumps or listed as exceptions.

diff --git a/backup/driver b/backup/driver
index d5d7a1f81f2d6e3df76d630c1e074d56ec4af07c..5dab3eb83c86a7756a504812119371a4658c56f9 100755 (executable)
--- a/backup/driver
+++ b/backup/driver
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 cd /var/lib/chiark-backup
 PATH=/usr/share/chiark-backup:$PATH export PATH

diff --git a/backup/full b/backup/full
index 419f2f7a6be982b40f43c6f6661b9607de60553a..61b62668ef47ba249ad1924690a6674c68786328 100755 (executable)
--- a/backup/full
+++ b/backup/full
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 BEGIN {
     $etc= '/etc/chiark-backup';

diff --git a/backup/increm b/backup/increm
index 4d59eee055655139a47a74de6868f34ddd9ad34f..c9d52cabc657b73b448b7379f6cad63fe2f899b3 100755 (executable)
--- a/backup/increm
+++ b/backup/increm
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # We are invoked by full if the tape description file says that it is
 # for an incremental backup.  We expect two commandline argument which

diff --git a/backup/iwjbackup.txt b/backup/iwjbackup.txt
index 44eaceec583b90fae62449222d7cda8fba1ca748..a353e757f9be57b18157d138d3b4fa0264390137 100644 (file)
--- a/backup/iwjbackup.txt
+++ b/backup/iwjbackup.txt
@@ -200,5 +200,5 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.

diff --git a/backup/loaded b/backup/loaded
index 12b1dd45b6654035b6e7baccf9447127af924247..7670e0617d58c22bc7b48d9fbde5f8229c335ba1 100755 (executable)
--- a/backup/loaded
+++ b/backup/loaded
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 set -e
 cd /var/lib/chiark-backup

diff --git a/backup/takedown b/backup/takedown
index f23c5747350fb622c5e82d7f9c0e55b87ca0d659..97a2a9fda1649926c6a3f49f2ec70a1644b6ac9d 100755 (executable)
--- a/backup/takedown
+++ b/backup/takedown
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # Expects a single (possibly empty) argument X which is used to select
 # a file /etc/chiark-backup/warnings.X. This file will contain lines like:

diff --git a/backup/whatsthis b/backup/whatsthis
index df89a729ecc1f7ff72966056f45e3ba1b5b7fe20..26315f8a4d3ab4b3c52ef1b95bb20b569adea2d3 100755 (executable)
--- a/backup/whatsthis
+++ b/backup/whatsthis
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # First rough hack; mostly just code nabbed from full. 
 # --list assumes the dump type was 'zafio', which is a bit bogus.

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 31184ff33eef39a25d3ce27a99017d73f8831ea1..584cda1d506cc71d7dd36dd38c9adda9207d81f0 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -18,8 +18,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 include ../settings.make
 

diff --git a/cprogs/dlist.h b/cprogs/dlist.h
index f7c5b0984b205b700b15b9bddfabe54d026e56f0..5c11e4ddee970aee172c061fecad05834d6da4a2 100644 (file)
--- a/cprogs/dlist.h
+++ b/cprogs/dlist.h
@@ -21,8 +21,8 @@
  *  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. 
+ *  along with this program; if not, consult the Free Software Foundation,
+ *  Inc., website at www.fsf.org, or the GNU Project website at www.gnu.org. 
  */
 
 #ifndef ADNS_DLIST_H_INCLUDED

diff --git a/cprogs/myopt.c b/cprogs/myopt.c
index 1876d06715a19fef06938e223a9f4d290b858ac3..c4d5a867aae0adcdca2f593ac5ce4955e7dce364 100644 (file)
--- a/cprogs/myopt.c
+++ b/cprogs/myopt.c
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * myopt.c - my very own option parsing
  *
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -15,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  */
 
 #include <stdio.h>

diff --git a/cprogs/myopt.h b/cprogs/myopt.h
index 89fa3addeaf38892985015bcc84e71b7f137ee2d..664fcca08ecde8c163e26c078dd7299e5fd503fe 100644 (file)
--- a/cprogs/myopt.h
+++ b/cprogs/myopt.h
@@ -1,7 +1,7 @@
 /*
  * myopt.h - declarations for my very own option parsing
  *
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -14,8 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  */
 
 #ifndef MYOPT_H

diff --git a/cprogs/readbuffer.c b/cprogs/readbuffer.c
index da681720fe5f3368047684833be024a1ad9cdd00..00df636489e37199af10989dd6b6c592a06455ce 100644 (file)
--- a/cprogs/readbuffer.c
+++ b/cprogs/readbuffer.c
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/cprogs/really.8 b/cprogs/really.8
index 3952e4661db55e0307b9b52432f4ec0da25c0819..45bca20fc4222b4090dd9013c7a8f878534c5af6 100644 (file)
--- a/cprogs/really.8
+++ b/cprogs/really.8
@@ -142,8 +142,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 .PP
 You should have received a copy of the GNU General Public
-License along with this file; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+License along with this file; if not, consult the Free Software
+Foundation's website at www.fsf.org, or the GNU Project website at
+www.gnu.org.
 .SH AVAILABILITY
 .B really
 is currently part of

diff --git a/cprogs/really.c b/cprogs/really.c
index bbb5ad815676c732be2e0db71db2764e7f98e052..46db5749510169b2302bb826d694bd749be3de56 100644 (file)
--- a/cprogs/really.c
+++ b/cprogs/really.c
@@ -1,7 +1,7 @@
 /*
  * really.c - program for gaining privilege
  *
- * Copyright (C) 1992-3 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1992-3 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -14,8 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  */
 
 #include <stdio.h>

diff --git a/cprogs/rwbuffer.c b/cprogs/rwbuffer.c
index fc73624fc90ecbf4345aa9d8ea845d700d3ca911..4d8503cfa9ff24b04e68944ff7e1116a12c374f5 100644 (file)
--- a/cprogs/rwbuffer.c
+++ b/cprogs/rwbuffer.c
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/cprogs/rwbuffer.h b/cprogs/rwbuffer.h
index 9ac09021447327bdcf040fb065e83a3e43698053..f49b30b874c37b7ddf84110898f7aab95557edb9 100644 (file)
--- a/cprogs/rwbuffer.h
+++ b/cprogs/rwbuffer.h
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/cprogs/smtpallow.c b/cprogs/smtpallow.c
index 36922bf85e2f99678ea4dfe432e7e929bd7ad2f4..b4f87656aaa2fbbb027db2adc9655ff7d81c4922 100644 (file)
--- a/cprogs/smtpallow.c
+++ b/cprogs/smtpallow.c
@@ -1,7 +1,7 @@
 /*
  * smtpallow.c - ld_preload for hacking with connect() !
  *
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -14,8 +14,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  */
 
 #include <syscall.h>

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 12419210d74eafa295584e4a74c3eb3d409fd5ba..66c790a0fe8e6c7810979835a5fd085a0c844bcb 100644 (file)
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -1,9 +1,29 @@
 /*
+ * summer - program for summarising (with md5 checksums) filesystem trees
+ *
  * usage:
  *    cat startpoints.list | summer >data.list
  *    summer startpoints... >data.list
  *  prints md5sum of data-list to stderr
  */
+/*
+ * Copyright (C) 2003,2006-2007 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * This 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,
+ * or (at your option) any later version.
+ *
+ * This 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
+ */
 
 #define _GNU_SOURCE
 

diff --git a/cprogs/trivsoundd.c b/cprogs/trivsoundd.c
index 0d7cd9e41deb839442ec7430e2486d68f67c83df..d1e6636a6d60fbded810f59a8c9758342c5980e2 100644 (file)
--- a/cprogs/trivsoundd.c
+++ b/cprogs/trivsoundd.c
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/cprogs/watershed.c b/cprogs/watershed.c
index 82e17dce924f84624adfc8ce6e4ca31f6c12c83b..dfc9480b2057be7b9adc8385f5acf8eb492d63ab 100644 (file)
--- a/cprogs/watershed.c
+++ b/cprogs/watershed.c
@@ -3,6 +3,8 @@
  *             unnecessary runs of idempotent commands
  *
  * watershed is Copyright 2007 Canonical Ltd
+ * written by Ian Jackson <ian@davenant.greenend.org.uk>
+ * and this version now maintained as part of chiark-utils
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,12 +17,10 @@
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * See the file XXXXX for a full list of credits information (often
- * installed as XXXXX.
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 /*

diff --git a/cprogs/wrbufcore.c b/cprogs/wrbufcore.c
index 2c3769fa0b22448559e77aeed0a040e61cc7c9c4..65fc2bede367227631169004b5e2598b84aa44fc 100644 (file)
--- a/cprogs/wrbufcore.c
+++ b/cprogs/wrbufcore.c
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/cprogs/writebuffer.c b/cprogs/writebuffer.c
index 190f152dff23710e3af9b724f9324380d28e41ed..da47cea862379581e8458ec92a5d4bdbedf98d63 100644 (file)
--- a/cprogs/writebuffer.c
+++ b/cprogs/writebuffer.c
@@ -22,8 +22,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 

diff --git a/debian/changelog b/debian/changelog
index 44d1d20cc26312a5253b3a81e5cb2e0008683572..f4c9614d4ebef47d54d56ed7c7ca48b6f78a4a78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ chiark-utils (4.1.21) unstable; urgency=low
 
   * backup-snaprsync: pass -I to rsync when copying rsums.
   * update licence to GPLv3 or later (was GPLv2 or later).
-  * remove FSF's paper address from debian/copyright.
+  * remove FSF's paper address from debian/copyright
+    and refer to the FSF and GNU websites instead.
   * update copyright dates in backup/.
+  * Fix some out of date email addresses.
 
  -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 21 Sep 2007 21:58:33 +0100
 

diff --git a/debian/copyright b/debian/copyright
index 0ba5fd85587be6a7377b26a6e28cd3a34131680b..ab21ac2ced2e2304f358125ae1d127130258bcc6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,5 +43,6 @@ 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-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/
+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.

diff --git a/scripts/Makefile b/scripts/Makefile
index 4f7a2254b98ff8f0bbe3079fc9a04ec5a3edc909..94458b6afaee642c5450426f1ea37e8ed90bdcf1 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -16,8 +16,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 include ../settings.make
 

diff --git a/scripts/cvsweb-list b/scripts/cvsweb-list
index 17ff50f6e3165a2baad6f5b85f93a007f26d6442..20511b9416657f1771f7db94fc7e5554961660e3 100755 (executable)
--- a/scripts/cvsweb-list
+++ b/scripts/cvsweb-list
@@ -20,8 +20,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 
 print <<END or die $!;

diff --git a/scripts/genspic2gnuplot b/scripts/genspic2gnuplot
index 7ba71c892ed172663ae92cdbca2594eb1577cd47..7c213c32711838d7331ab429ade2d69b89da752b 100755 (executable)
--- a/scripts/genspic2gnuplot
+++ b/scripts/genspic2gnuplot
@@ -31,8 +31,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 die unless @ARGV==1;
 die if $ARGV[0] =~ m/^\-/;
@@ -124,4 +124,4 @@ close A or die $!;
 
 print ": generated ; $sof\n" or die $!;
 
-# $Id: genspic2gnuplot,v 1.5 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: genspic2gnuplot,v 1.6 2007-09-21 21:21:15 ianmdlvl Exp $

diff --git a/scripts/gnucap2genspic b/scripts/gnucap2genspic
index b08a0be0ca47dba80a05670cd69ebbbb480a81e7..dc150a11c3dad5df8cb08e3c320155ede4ba9434 100755 (executable)
--- a/scripts/gnucap2genspic
+++ b/scripts/gnucap2genspic
@@ -28,8 +28,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 die if @ARGV;
 
@@ -106,4 +106,4 @@ die "no plots" unless defined $kind;
 endplot();
 print "F\n" or die $!;
 
-# $Id: gnucap2genspic,v 1.3 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: gnucap2genspic,v 1.4 2007-09-21 21:21:15 ianmdlvl Exp $

diff --git a/scripts/named-conf b/scripts/named-conf
index 4f3536ba4bbcb9457a5ebf165f6f33ee3d10ebe5..1f02e2152a6ede0361532f98a585c0ffa4ec4f91 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -12,8 +12,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 use strict;
 use IO::File;

diff --git a/scripts/named-conf.8 b/scripts/named-conf.8
index b1547fe93e2c440e5f7e011271243227009b3ef2..724699489a982516d95a0a1b0bc4a1856792d85a 100644 (file)
--- a/scripts/named-conf.8
+++ b/scripts/named-conf.8
@@ -562,5 +562,5 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.

diff --git a/scripts/ngspice2genspic b/scripts/ngspice2genspic
index 431863de322ac26b605eb218b85bb9ef1420772a..1d80d60d1ad68352453192f762a4801adb71a5a5 100755 (executable)
--- a/scripts/ngspice2genspic
+++ b/scripts/ngspice2genspic
@@ -25,8 +25,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 die if @ARGV;
 
@@ -92,4 +92,4 @@ while (<STDIN>) {
 die "no plots" unless defined $ctable;
 print "F\n" or die $!;
 
-# $Id: ngspice2genspic,v 1.2 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: ngspice2genspic,v 1.3 2007-09-21 21:21:15 ianmdlvl Exp $

diff --git a/scripts/palm-datebook-reminders.1 b/scripts/palm-datebook-reminders.1
index 7a5dff4beecbe81d9d1dae98ac5129ea13730c7c..40a9301a8aa6144b53a6eac71dc52d67971f929d 100644 (file)
--- a/scripts/palm-datebook-reminders.1
+++ b/scripts/palm-datebook-reminders.1
@@ -59,8 +59,8 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 Palm Datebook is a piece of proprietary software supplied with Palm
 organisers.  Palm and Datebook are probably trademarks.

diff --git a/settings.make b/settings.make
index 7ee869b27ad69b74ac88e99347d4520d381ffa1a..52a4f7373b2f164e1d8e61e8bfb5c95dfb5a0ec2 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -16,8 +16,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 CONFIG_CPPFLAGS=       -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
                        -DREALLY_CHECK_FILE='"/etc/inittab"'

diff --git a/sync-accounts/Makefile b/sync-accounts/Makefile
index dcb1a510e3909afd900284cd513448469c722ad6..f9279e295ace20dd4ef612524017b0faea47ed6b 100644 (file)
--- a/sync-accounts/Makefile
+++ b/sync-accounts/Makefile
@@ -16,8 +16,8 @@
 # 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.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 SYSTEM_GROUP=  root
 

diff --git a/sync-accounts/grab-account b/sync-accounts/grab-account
index c4e5cfec1c3eab458c19261d946175ae61464952..80032152793b7bf42f3b907bd890ee66507a9ae5 100755 (executable)
--- a/sync-accounts/grab-account
+++ b/sync-accounts/grab-account
@@ -16,10 +16,10 @@
 #  General Public License for more details.
 #
 #  You should already have a copy of the GNU General Public License.
-#  If not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA.
+#  If not, consult the Free Software Foundation's website at
+#  www.fsf.org, or the GNU Project website at www.gnu.org.
 #
-# $Id: grab-account,v 1.4 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: grab-account,v 1.5 2007-09-21 21:21:15 ianmdlvl Exp $
 
 set -e
 
@@ -28,7 +28,7 @@ then
        echo >&2 \
 'usage: grab-account <localuser> <shorthostname> [<remoteuser>]
 creates an entry in /etc/sync-accounts, and runs sync-accounts
-$Id: grab-account,v 1.4 2007-09-21 20:59:02 ianmdlvl Exp $'
+$Id: grab-account,v 1.5 2007-09-21 21:21:15 ianmdlvl Exp $'
        exit 1
 fi
 

diff --git a/sync-accounts/grab-account.8 b/sync-accounts/grab-account.8
index 2b39340e9e79d6b3b5973797af5b46effc08cb45..e5822dcd28410e263b91cea47fb329bc12c27ebb 100644 (file)
--- a/sync-accounts/grab-account.8
+++ b/sync-accounts/grab-account.8
@@ -69,8 +69,8 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.
 .SH SEE ALSO
 .BR sync-accounts "(8), "
 .BR sync-accounts "(5), "

diff --git a/sync-accounts/sync-accounts b/sync-accounts/sync-accounts
index 5e26a988e4371e60e075bda8b52b3f94dbd68823..cef131c78b8b7d3aa0e5d7b5a5cdec943a1bdc8d 100755 (executable)
--- a/sync-accounts/sync-accounts
+++ b/sync-accounts/sync-accounts
@@ -16,10 +16,10 @@
 #  General Public License for more details.
 #
 #  You should already have a copy of the GNU General Public License.
-#  If not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA.
+#  If not, consult the Free Software Foundation's website at
+#  www.fsf.org, or the GNU Project website at www.gnu.org.
 #
-# $Id: sync-accounts,v 1.24 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: sync-accounts,v 1.25 2007-09-21 21:21:15 ianmdlvl Exp $
 
 use POSIX;
 

diff --git a/sync-accounts/sync-accounts-createuser b/sync-accounts/sync-accounts-createuser
index 63601d996d47c192a0c87e784d3edc6c02d73254..a8f7904cfcb4e6474189aab0b09be0d0211e075a 100755 (executable)
--- a/sync-accounts/sync-accounts-createuser
+++ b/sync-accounts/sync-accounts-createuser
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: sync-accounts-createuser,v 1.5 2007-09-21 20:59:02 ianmdlvl Exp $
+# $Id: sync-accounts-createuser,v 1.6 2007-09-21 21:21:15 ianmdlvl Exp $
 #
 # Copyright 1999-2002 Ian Jackson <ian@davenant.greenend.org.uk>
 #
@@ -14,8 +14,8 @@
 #  for more details.
 #
 #  You should already have a copy of the GNU General Public License.
-#  If not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA.
+#  If not, consult the Free Software Foundation's website at
+#  www.fsf.org, or the GNU Project website at www.gnu.org.
 
 set -e
 un=$SYNCUSER_CREATE_USER

diff --git a/sync-accounts/sync-accounts-createuser.8 b/sync-accounts/sync-accounts-createuser.8
index f2c7ca3427273fd9312251f8688b8857ac51a80e..ffd897d650a0c672ec3aed542d55dc198ca2ccf6 100644 (file)
--- a/sync-accounts/sync-accounts-createuser.8
+++ b/sync-accounts/sync-accounts-createuser.8
@@ -93,8 +93,8 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.
 .SH SEE ALSO
 .BR sync-accounts "(8), "
 .BR sync-accounts "(5), "

diff --git a/sync-accounts/sync-accounts.5 b/sync-accounts/sync-accounts.5
index 18b510b7d05b022f8b04e71f457899a04dbab337..c5d198bae3d76b22ed8c11f69d2d2eb4da1f30a4 100644 (file)
--- a/sync-accounts/sync-accounts.5
+++ b/sync-accounts/sync-accounts.5
@@ -382,8 +382,8 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.
 .SH SEE ALSO
 .BR sync-accounts "(8), "
 .BR grab-account "(8), "

diff --git a/sync-accounts/sync-accounts.8 b/sync-accounts/sync-accounts.8
index 7f53436b2c7b78f021114dea3b2acbb964fa7296..5e2ca29cdec3b8da883938ddb47269e3cb500175 100644 (file)
--- a/sync-accounts/sync-accounts.8
+++ b/sync-accounts/sync-accounts.8
@@ -141,8 +141,8 @@ 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.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.
 .SH SEE ALSO
 .BR sync-accounts "(5), "
 .BR grab-account "(8), "