From 45b9200fc6ca66988e140cfa91eeb486859986a1 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 18 Oct 2005 19:26:08 +0000 Subject: [PATCH] Ammend the Mini-XML license agreement to allow static linking. --- CHANGES | 4 +++- COPYING | 27 ++++++++++++++++++++++++++- doc/license.html | 35 +++++++++++++++++++++++++++++++++-- doc/relnotes.html | 3 +++ 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 5eec7d4..4cec895 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,10 @@ -CHANGES - 10/13/2005 +CHANGES - 10/18/2005 -------------------- CHANGES IN Mini-XML 2.3 + - Added two exceptions to the LGPL to support static + linking of applications against Mini-XML. - The mxmldoc program now supports "@since version@" and "@deprecated@" comments. - Fixed function and enumeraion type bugs in mxmldoc. diff --git a/COPYING b/COPYING index 43433c4..fd9d353 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,29 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE + Mini-XML License + October 18, 2005 + + +The Mini-XML library and included programs are provided under the +terms of the GNU Library General Public License (LGPL) with the +following exceptions: + + 1. Static linking of applications to the Mini-XML library + does not constitute a derivative work and does not require + the author to provide source code for the application, use + the shared Mini-XML libraries, or link their applications + against a user-supplied version of Mini-XML. + + If you link the application to a modified version of + Mini-XML, then the changes to Mini-XML must be provided + under the terms of the LGPL in sections 1, 2, and 4. + + 2. You do not have to provide a copy of the Mini-XML license + with programs that are linked to the Mini-XML library, nor + do you have to identify the Mini-XML license in your + program or documentation as required by section 6 of the + LGPL. + + + GNU LIBRARY GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. diff --git a/doc/license.html b/doc/license.html index 8585ed5..c84bba0 100644 --- a/doc/license.html +++ b/doc/license.html @@ -1,9 +1,40 @@ -

A - GNU Library General -Public License

+

A - Mini-XML License

+

October 18, 2005

+ +

The Mini-XML library and included programs are provided under +the terms of the GNU Library General Public License (LGPL) with +the following exceptions:

+ +
    + +
  1. Static linking of applications to the Mini-XML + library does not constitute a derivative work and does + not require the author to provide source code for the + application, use the shared Mini-XML libraries, or link + their applications against a user-supplied version of + Mini-XML. + +

    If you link the application to a modified version + of Mini-XML, then the changes to Mini-XML must be + provided under the terms of the LGPL in sections 1, 2, + and 4.

    +
    2. + +
  2. You do not have to provide a copy of the Mini-XML + license with programs that are linked to the Mini-XML + library, nor do you have to identify the Mini-XML license + in your program or documentation as required by section 6 + of the LGPL.
    3. + +
+ +
+ +

GNU LIBRARY GENERAL PUBLIC LICENSE

Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA diff --git a/doc/relnotes.html b/doc/relnotes.html index c139b3c..b6b869f 100644 --- a/doc/relnotes.html +++ b/doc/relnotes.html @@ -7,6 +7,9 @@