COPYING: Update to current ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes...

	* COPYING: Update to current
	ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes references
	to 19yy as example year in copyright notice).

From-SVN: r38340

diff --git a/libjava/COPYING b/libjava/COPYING
index 60549be514af76c5db0c17ce6bbe01b2f81e2d9e..d60c31a97a544b53039088d14fe9114583c0efc3 100644 (file)
--- a/libjava/COPYING
+++ b/libjava/COPYING
@@ -2,7 +2,7 @@
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 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
@@ -313,7 +313,7 @@ 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.

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1bbb6faec236c1c1cda5189e2e37fd934e2de0d3..7125e0d6b2a6dd63ceedead4a21cf0a4ce439140 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-18  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * COPYING: Update to current
+       ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes references
+       to 19yy as example year in copyright notice).
+
 2000-12-18  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/util/zip/natInflater.cc (inflate): Treat Z_BUF_ERROR as