Hi, On Mon, 2002-01-14 at 23:15, Etienne M. Gagnon wrote: > On Mon, Jan 14, 2002 at 01:03:25PM -0700, Richard Stallman wrote: > > > > It should say "not derived from or based on..." > > I omitted the word "from". > > Here's the corrected text: > > [SNIP] > > Shall we go ahead with it?
OK. Since nobody objected and some people reacted positively to this and since it is basically just a clarification of the intend of the current license text I like to go forward with it. I can use the same scripts that I used for the GNU Classpath AWT relicensing. I will use it on all java and native source files in Classpath and all the java files in the libgcj tree which have been merged with their Classpath version. I will also change the documentation, web files, LIBGCJ_LICENSE, etc when they mention the license and/or exception text. Attached is the diff to the LIBGCJ_LICENSE file and a sample diff for an ordinary java source file. I have already done most of this in my local tree but have to carefully check the results by hand to make sure that I didn't make any mistakes. When I check it in (on monday) I will post it on the [EMAIL PROTECTED] and [EMAIL PROTECTED] lists (but omitting most of the actual patches to the source files since they are big and boring). Any objections or comments? Cheers, Mark
Index: LIBGCJ_LICENSE =================================================================== RCS file: /cvs/gcc/gcc/libjava/LIBGCJ_LICENSE,v retrieving revision 1.2 diff -u -r1.2 LIBGCJ_LICENSE --- LIBGCJ_LICENSE 2000/03/07 19:55:24 1.2 +++ LIBGCJ_LICENSE 2002/01/19 16:31:41 @@ -1,14 +1,24 @@ -March 7, 2000 +Jan 21, 2002 The libgcj library is licensed under the terms of the GNU General -Public License, with this special exception: +Public License. - 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. +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +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. You should have received a copy of the GNU General Public License along with libjava; see the file COPYING. If not, write to the
Index: java/io/Externalizable.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/Externalizable.java,v retrieving revision 1.2 diff -u -r1.2 Externalizable.java --- Externalizable.java 2001/09/01 00:59:09 1.2 +++ Externalizable.java 2002/01/19 16:32:06 @@ -18,11 +18,22 @@ 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. */ +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +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. */ package java.io;
