This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Fastjar, copyright, and upstream...
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: Christoph Hellwig <hch at infradead dot org>
- Cc: "Joseph S. Myers" <jsm at polyomino dot org dot uk>, Nathanael Nerode <neroden at twcny dot rr dot com>, gcc-patches at gcc dot gnu dot org, Mark Mitchell <mark at codesourcery dot com>
- Date: Wed, 13 Aug 2003 23:08:39 +0200
- Subject: Re: Fastjar, copyright, and upstream...
- References: <20030711232826.GA1448@doctormoo><Pine.LNX.4.56.0307120040140.21759@kern.srcf.societies.cam.ac.uk><16145.11835.180101.266870@gargle.gargle.HOWL><20030713131605.A16346@infradead.org>
Christoph Hellwig writes:
> On Sun, Jul 13, 2003 at 12:02:35PM +0200, Matthias Klose wrote:
> > > from that manual.
> >
> > If that's the case, I'm going to check in this license change:
> >
> > 2003-07-13 Matthias Klose <doko@debian.org>
> >
> > * fastjar.texi: License manual under the GPL.
> > * Makefile.am: Remove reference to fdl.texi
> > * Makefile.in: Regenerate
> >
> > --- fastjar/fastjar.texi.orig 2003-07-13 11:33:05.000000000 +0200
> > +++ fastjar/fastjar.texi 2003-07-13 11:45:28.000000000 +0200
> > @@ -35,32 +35,16 @@
> > Copyright (C) @value{copyrights-fastjar} Free Software Foundation, Inc.
>
> Shouldn't that change to
>
> Copyright (C) @value{copyrights-fastjar} Matthias Klose
>
> then, too?
ok changed that. commited the following patch. Mark, ok for the 3.3
branch as well?
2003-08-13 Matthias Klose <doko@debian.org>
* fastjar.texi: License manual under the GPL.
* Makefile.am: Remove reference to fdl.texi
* Makefile.in: Regenerate
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- Makefile.am 30 Dec 2002 21:32:30 -0000 1.11
+++ Makefile.am 13 Aug 2003 21:01:37 -0000
@@ -62,7 +62,6 @@
info_TEXINFOS = fastjar.texi
fastjar_TEXINFOS = \
../gcc/doc/include/gcc-common.texi \
- ../gcc/doc/include/fdl.texi \
../gcc/doc/include/gpl.texi
man_MANS = jar.1 grepjar.1
EXTRA_DIST = $(man_MANS)
Index: fastjar.texi
===================================================================
RCS file: /cvs/gcc/gcc/fastjar/fastjar.texi,v
retrieving revision 1.5
diff -u -r1.5 fastjar.texi
--- fastjar.texi 30 Mar 2003 16:56:32 -0000 1.5
+++ fastjar.texi 13 Aug 2003 21:01:37 -0000
@@ -32,35 +32,19 @@
@end format
@c man begin COPYRIGHT
-Copyright (C) @value{copyrights-fastjar} Free Software Foundation, Inc.
+Copyright (C) @value{copyrights-fastjar} Matthias Klose
Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below). A copy of the license is included in the
+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. A copy of the license is included in the
@c man end
-section entitled
-``GNU Free Documentation License''.
+section entitled ``GNU General Public License''.
@ignore
@c man begin COPYRIGHT
-man page gfdl(7).
+man page gpl(7).
@c man end
@end ignore
-
-@c man begin COPYRIGHT
-
-(a) The FSF's Front-Cover Text is:
-
- A GNU Manual
-
-(b) The FSF's Back-Cover Text is:
-
- You have freedom to copy and modify this GNU Manual, like GNU
- software. Copies published by the Free Software Foundation raise
- funds for GNU development.
-@c man end
@end ifinfo
@titlepage
@@ -69,7 +53,7 @@
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc.
+Copyright @copyright{} @value{copyrights-gcj} Matthias Klose
@sp 2
For the @value{which-gcj} Version*
@sp 1
@@ -78,22 +62,10 @@
Boston, MA 02111-1307, USA@*
@sp 1
Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', the Front-Cover
-texts being (a) (see below), and with the Back-Cover Texts being (b)
-(see below). A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
-(a) The FSF's Front-Cover Text is:
-
- A GNU Manual
-
-(b) The FSF's Back-Cover Text is:
-
- You have freedom to copy and modify this GNU Manual, like GNU
- software. Copies published by the Free Software Foundation raise
- funds for GNU development.
+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. A copy of the license is included in the
+section entitled ``GNU General Public License''.
@end titlepage
@contents
@page
@@ -108,8 +80,6 @@
* Invoking jar:: Options supported by @command{jar}
* Invoking grepjar:: Options supported by @command{grepjar}
* Copying:: The GNU General Public License
-* GNU Free Documentation License::
- How you can share and copy this manual
@end menu
@node Invoking jar
@@ -259,7 +229,5 @@
@c man end
@include gpl.texi
-
-@include fdl.texi
@bye