Re: Update copyright notice on Classpath/libgcj merged files

[Mark Wielaard <mark at klomp dot org>]

On Thu, Jan 25, 2001 at 02:38:56PM +0100, Mark Wielaard wrote:
> 
> 2001-01-25  Mark Wielaard <mark@klomp.org>
>     * java/io/DataInputStream.java: update copyright notice
>     * java/io/PrintWriter.java: idem
>     * java/io/Reader.java: idem
>     * java/io/StreamTokenizer.java: idem
>     * java/io/StringReader.java: idem
>     * java/lang/reflect/ReflectPermission.java: idem

And here is the actual patch.
Index: java/io/DataInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/DataInputStream.java,v
retrieving revision 1.8
diff -u -u -r1.8 DataInputStream.java
--- DataInputStream.java	2001/01/06 23:28:40	1.8
+++ DataInputStream.java	2001/01/25 13:29:55
@@ -1,10 +1,28 @@
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* DataInputStream.java -- FilteredInputStream that implements DataInput
+   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath 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.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
  
 package java.io;
 
Index: java/io/PrintWriter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/PrintWriter.java,v
retrieving revision 1.6
diff -u -u -r1.6 PrintWriter.java
--- PrintWriter.java	2000/08/24 06:56:38	1.6
+++ PrintWriter.java	2001/01/25 13:29:55
@@ -1,11 +1,29 @@
-/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
+/* PrintWriter.java -- prints primitive values and objects to a stream as text
+   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath 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.
  
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
 package java.io;
 
 /**
Index: java/io/Reader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/Reader.java,v
retrieving revision 1.4
diff -u -u -r1.4 Reader.java
--- Reader.java	2000/10/30 09:20:47	1.4
+++ Reader.java	2001/01/25 13:29:55
@@ -1,11 +1,29 @@
-/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
+/* Reader.java -- base class of classes that read input as a stream of chars
+   Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath 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.
  
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
 package java.io;
  
 /* Written using "Java Class Libraries", 2nd edition, plus online
Index: java/io/StreamTokenizer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/StreamTokenizer.java,v
retrieving revision 1.8
diff -u -u -r1.8 StreamTokenizer.java
--- StreamTokenizer.java	2001/01/09 11:21:12	1.8
+++ StreamTokenizer.java	2001/01/25 13:29:58
@@ -1,11 +1,29 @@
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* StreamTokenizer.java -- parses streams of characters into tokens
+   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath 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.
  
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
 package java.io;
 
 /**
Index: java/io/StringReader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/StringReader.java,v
retrieving revision 1.4
diff -u -u -r1.4 StringReader.java
--- StringReader.java	2000/10/30 09:20:47	1.4
+++ StringReader.java	2001/01/25 13:29:58
@@ -1,11 +1,29 @@
-/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
+/* StringReader.java -- permits a String to be read as a character input stream
+   Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
-   This file is part of libgcj.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
+GNU Classpath 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.
  
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
 package java.io;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
Index: java/lang/reflect/ReflectPermission.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/reflect/ReflectPermission.java,v
retrieving revision 1.1
diff -u -u -r1.1 ReflectPermission.java
--- ReflectPermission.java	2000/11/20 18:25:41	1.1
+++ ReflectPermission.java	2001/01/25 13:29:58
@@ -1,18 +1,29 @@
-// ReflectPermission.java - Process modifier values.
+/* ReflectPermission.java - named permission for reflaction
+   Copyright (C) 2000, 2001  Free Software Foundation
 
-/* Copyright (C) 2000  Free Software Foundation
+This file is part of GNU Classpath.
 
-   This file is part of libgcj.
+GNU Classpath 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.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/**
- * @author Tom Tromey <tromey@redhat.com>
- * @date November 18, 2000
- */
-
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
@@ -26,6 +37,9 @@
 /**
  * This class implements permissions for reflection.  This is a named
  * permission, and the only defined name is suppressAccessChecks.
+ *
+ * @author Tom Tromey <tromey@redhat.com>
+ * @date November 18, 2000
  */
 public final class ReflectPermission extends BasicPermission
 {