We still have the FSF's old address in our COPYING files, in both the
21.4 and 21.5 branches. The latest upstream version of COPYING also
recognizes the fact that we are no longer living in the 20th century.
This patch applies to both 21.4 and 21.5.
ChangeLog addition:
2006-04-06 Jerry James <james(a)xemacs.org>
* COPYING: Update to latest upstream version.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: COPYING
Index: COPYING
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/COPYING,v
retrieving revision 1.1.1.1
diff -d -u -r1.1.1.1 COPYING
--- COPYING 1996/12/18 22:42:14 1.1.1.1
+++ COPYING 2006/04/06 15:00:39
@@ -2,8 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330
- Boston, MA 02111-1307, USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -292,7 +291,7 @@
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -305,16 +304,16 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. 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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department
http://www.cs.usu.edu/~jerry/
Utah State University