On Mon, Jul 30, 2001 at 10:22:46AM +0200, Lars Gullik Bjønnes wrote:
> John Levon <[EMAIL PROTECTED]> writes:
>
> | shouldn't we word the GPL exception as suggested here :
> |
> | http://www.gnu.org/licenses/gpl-faq.html#TOCWritingFSWithNFLibs
>
> Yes, we probably should.
how about this ?
john
--
"I'd rather be rudely informed than politely left in the dark."
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.797
diff -u -r1.797 ChangeLog
--- ChangeLog 2001/07/30 15:35:25 1.797
+++ ChangeLog 2001/07/30 16:28:16
@@ -1,5 +1,9 @@
2001-07-30 John Levon <[EMAIL PROTECTED]>
+ * COPYING: use standard spiel for xforms
+
+2001-07-30 John Levon <[EMAIL PROTECTED]>
+
* configure.in: add --without-aiksaurus, always
subst AIKSAURUS_LIBS
Index: COPYING
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/COPYING,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 COPYING
--- COPYING 1999/09/27 18:44:28 1.1.1.1
+++ COPYING 2001/07/30 16:28:16
@@ -1,41 +1,27 @@
-While LyX has been released nominally under the GPL in the past, it
-has in fact never been truly GPL. Particularly, it has always been
-linked to a closed source library. While some have taken a view that
-such actions violate the GPL, this is a legal impossibility. The law
-is quite clear that the release of the software by the original authors
-and copyright holders changed the licenses.
-
-Rather than leaving the issue to be debated, the following
-clarifications are given. This is *not* a change of license, but a
-clarification of the license that LyX has always used. All patches
-submitted to LyX fall under this same license.
+ This program 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.
-1) LyX is quasi-GPL software. The terms of the GPL apply save where
-they conflict with this statement.
-
-2) There is no limitation on the license or nature of any software,
-source, binary, library, or other, that may be linked to LyX, or to
-which LyX may be linked. Particularly, the second full paragraph of
-section 2, from 'These requirements apply to the modified work'
-through 'who wrote it.' is rejected in its entirety.
+ This program 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.
-3) There is no limitation on combining LyX source code with code
-subject to any other license, provided that the LyX source remains
-under this same license. Particularly, Section 3 of the GPL is
-rejected in its entirety. To redistribute a modified version of LyX,
-the entire source code of the modified LyX must be made available under
-the terms of this license or such other licenses as apply to portions
-of the original or modified code.
-
-4) Any other clause or interpretation of the GPL limiting the
-combination of other software of any type and LyX is rejected in its
-entirety, provided that the LyX code and modifications to the LyX
-source code remains under this same license, or such other licenses as
-apply to portions of the original or modified code.
-
-5) Nothing in this statement purports to alter or interpret the
-license of any other software. Any combination of other software with
-LyX must also meet the requirements of that software.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ In addition, as a special exception, the LyX Team gives permission to
+ link the code of this program with the XForms library (or with modified
+ versions of XForms that use the same license as XForms), and distribute
+ linked combinations including the two. You must obey the GNU General
+ Public License in all respects for all of the code used other than XForms.
+ If you modify this file, you may extend this exception to your version of
+ the file, but you are not obligated to do so. If you do not wish to do so,
+ delete this exception statement from your version.
+
+ The GNU General Public License version 2 is included below for your reference.
------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
