[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [cp-patches] License fix
From: |
Mark Wielaard |
Subject: |
Re: [cp-patches] License fix |
Date: |
Wed, 21 Sep 2005 23:06:35 +0200 |
Hi Andrew,
On Wed, 2005-09-21 at 21:49 +0100, Andrew John Hughes wrote:
> I'm committing the attached patch which fixes a few remaining cases of the
> wrong address within the GPL license.
Thanks for finding and fixing these. One of these files was missed
because it used the wrong indenting. Fixed as follows:
2005-09-21 Mark Wielaard <address@hidden>
* gnu/classpath/ByteArray.java: Reindent boilerplate.
Committed,
Mark
Index: gnu/classpath/ByteArray.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/ByteArray.java,v
retrieving revision 1.2
diff -u -r1.2 ByteArray.java
--- gnu/classpath/ByteArray.java 21 Sep 2005 20:55:40 -0000 1.2
+++ gnu/classpath/ByteArray.java 21 Sep 2005 21:04:38 -0000
@@ -1,25 +1,22 @@
/* ByteArray.java -- wrapper around a byte array, with nice toString output.
Copyright (C) 2005 Free Software Foundation, Inc.
-This file is a part of GNU Classpath.
+This file is part of GNU Classpath.
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 of the License, or (at
-your option) any later version.
+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; if not, write to the
-
- Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301
- USA
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -29,14 +26,14 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package gnu.classpath;
signature.asc
Description: This is a digitally signed message part