Update to GPLv3+; update copyright notices everywhere.

4 files changed, 54 insertions, 41 deletions

diff --git a/groupmanage/INSTALL b/groupmanage/INSTALL
index 545583b..bd1780b 100644
--- a/groupmanage/INSTALL
+++ b/groupmanage/INSTALL
@@ -17,11 +17,22 @@ groupmanage depends on /etc/environment setting up a sensible PATH.
 # group:description:manager:maint-users:home
 There must be no blank lines in /etc/grouplist.
 
-Groupmanage is Copyright
-(C)1995-9 Ian Jackson <ian@davenant.greenend.org.uk>
-(C)1998 David Damerell <damerell@chiark.greenend.org.uk>
-(C)1999,2003 Chancellor Masters and Scholars of the University of Cambridge
-and is distributed under the terms of the GNU General Public License,
-version 2, or (at your option), any later version.
+groupmanage is part of userv-utils, which are
+Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+Copyright 1999,2003
+   Chancellor Masters and Scholars of the University of Cambridge
+Copyright 2010 Tony Finch <fanf@dotat.at>
 
-$Id$
+All the utilities here are 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 of the License, or (at your
+option) any later version.
+
+This program 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 userv-utils; if not, see http://www.gnu.org/licenses/.
diff --git a/groupmanage/Makefile b/groupmanage/Makefile
index b49f375..f8ac2c5 100644
--- a/groupmanage/Makefile
+++ b/groupmanage/Makefile
@@ -1,12 +1,15 @@
 # Makefile
 # installation runes for groupmanage
 
-# Copyright (C) 2003 Ian Jackson
-# This file is part of groupmanage, part of userv-utils
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,10 +18,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 include ../settings.make
 
diff --git a/groupmanage/groupmanage b/groupmanage/groupmanage
index 21a7327..24c007b 100755
--- a/groupmanage/groupmanage
+++ b/groupmanage/groupmanage
@@ -1,23 +1,23 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 1995-9, 2003 Ian Jackson <ijackson@chiark.greenend.org.uk>
-# Copyright (C) 1999, 2003
-#   Chancellor Masters and Scholars of the University of Cambridge
-#
-# Improved by Ben Harris <bjh21@cam.ac.uk> in 1999 and 2003 for Unix
-# Support's own nefarious purposes.
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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 2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# It 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.
+# This program 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.
 #
-# $Id$
+# You should have received a copy of the GNU General Public License
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 sub usage {
     &unlock;
diff --git a/groupmanage/groupmanage.text b/groupmanage/groupmanage.text
index 2a38961..ceafe6f 100644
--- a/groupmanage/groupmanage.text
+++ b/groupmanage/groupmanage.text
@@ -46,21 +46,23 @@ without having to ask other users to chmod files, or having to type
 incantations to switch between working on shared files and your
 personal files.
 
- Copyright (C) 1999,2003 Ian Jackson
- This file is part of groupmanage, part of userv-utils
 
- 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 2 of the License, or
- (at your option) any later version.
+userv-utils are
+Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+Copyright 1999,2003
+   Chancellor Masters and Scholars of the University of Cambridge
+Copyright 2010 Tony Finch <fanf@dotat.at>
 
- This program 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.
+All the utilities here are 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 of the License, or (at your
+option) any later version.
 
- You should have received a copy of the GNU General Public License
- along with userv-utils; if not, write to the Free Software
- Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+This program 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.
 
-$Id$
+You should have received a copy of the GNU General Public License
+along with userv-utils; if not, see http://www.gnu.org/licenses/.