This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Fastjar, copyright, and upstream...
Joseph S. Myers writes:
> On Fri, 11 Jul 2003, Nathanael Nerode wrote:
>
> > or better yet part of GCC? Since only two non-FSF copyrights are
> > involved, both individuals, it seems to me that something reasonable
> > could be done here.
>
> Except that Jim Wilson has noted
> <http://gcc.gnu.org/ml/gcc-patches/2003-07/msg01187.html> that, fastjar
> not being part of GCC, GCC assignments don't apply to fastjar.
>
> This does mean that the fastjar manual is actually copyright Matthias
> Klose and so he's free to remove the Invariant Section and Cover Texts
> 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.
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
@@ -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
@@ -260,6 +230,4 @@
@include gpl.texi
-@include fdl.texi
-
@bye
--- fastjar/Makefile.am~ 2003-01-01 16:52:11.000000000 +0100
+++ fastjar/Makefile.am 2003-07-13 11:46:00.000000000 +0200
@@ -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)