[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www gnu-new.css licenses/license-list.html lice...
|
From: |
Brett Smith |
|
Subject: |
www gnu-new.css licenses/license-list.html lice... |
|
Date: |
Wed, 11 Jul 2007 13:43:00 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 07/07/11 13:43:00
Modified files:
. : gnu-new.css
licenses : license-list.html gpl-faq.html
Log message:
Add the huge GNU license compatibility matrix to the GPL FAQ. Note that
this required some additional CSS to support it.
Add Artistic License 2.0 to the license-list, and update the comments
about
related licenses (Clarified Artistic License, Artistic 1.0, Perl's
disjunctive license).
Minor tweaks -- make an e-mail address a link here, make a double-dash
an
emdash there, things like that.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu-new.css?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.195&r2=1.196
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.103&r2=1.104
Patches:
Index: gnu-new.css
===================================================================
RCS file: /web/www/www/gnu-new.css,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gnu-new.css 29 Jun 2007 16:50:03 -0000 1.57
+++ gnu-new.css 11 Jul 2007 13:42:50 -0000 1.58
@@ -344,3 +344,20 @@
.lyrics{background-color: whitesmoke; font-style: italic; width: 20em;
padding: 2em; border: 2px solid #e5e5e5; margin-left: 15em;}
#gplv3-dogear{ position: absolute; top: -1px; left: -1px; height: 120px;
width: 120px; }
\ No newline at end of file
+
+/* Licensing */
+/* This is for licenses/gpl-faq.html. */
+
+table#gpl-compat-matrix { border-collapse: collapse; }
+
+table#gpl-compat-matrix td, th.gpl-matrix-border {
+ text-align: center; border: 1px solid black; margin: 0;
+ padding: .3em; }
+
+th.gpl-matrix-license { text-align: right; }
+
+tr.gpl-matrix-use-type { border-top: 2px solid black; }
+
+table#gpl-compat-matrix td.ok { background-color: #ccffcc; }
+table#gpl-compat-matrix td.mok { background-color: #e4ffcc; }
+table#gpl-compat-matrix td.nok { background-color: #dddddd; }
Index: licenses/license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- licenses/license-list.html 29 Jun 2007 15:43:01 -0000 1.195
+++ licenses/license-list.html 11 Jul 2007 13:42:56 -0000 1.196
@@ -111,12 +111,18 @@
certain patent termination and indemnification provisions.</p></dd>
+<dt><a href="http://www.perlfoundation.org/artistic_license_2_0";>Artistic
+License 2.0</a></dt>
+
+<dd><p>This license is a free software license, compatible with the GPL
+thanks to the relicensing option in section 4(c)(ii).</p></dd>
+
<dt><a
href="http://www.statistica.unimib.it/utenti/dellavedova/software/artistic2.html";>
Clarified Artistic License</a></dt>
<dd>
<p>This license is a free software license, compatible with the GPL. It
is the minimal set of changes needed to correct the vagueness of the <a
-href="#ArtisticLicense">Original Artistic License</a>.</p></dd>
+href="#ArtisticLicense">Artistic License 1.0</a>.</p></dd>
<dt><a href="http://www.gnu.org/licenses/info/Sleepycat.html";>
Berkeley Database License</a> (aka the Sleepycat Software Product
@@ -278,11 +284,11 @@
compatible with the GNU GPL.</p></dd>
-<dt><a id="PerlLicense">License of Perl</a></dt>
+<dt><a id="PerlLicense">License of Perl 5 and below</a></dt>
<dd>
<p>This license is the disjunction of the <a
-href="#ArtisticLicense">Artistic License</a> and the <a
-href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a>--in other words,
+href="#ArtisticLicense">Artistic License 1.0</a> and the <a
+href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a>—in other words,
you can choose either of those two licenses. It qualifies as a free
software license, but it may not be a real copyleft. It is compatible
with the <a href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a>
@@ -904,24 +910,13 @@
is a free software license.</p></dd>
-<dt><a id="ArtisticLicense">(Original) Artistic License</a></dt>
+<dt><a id="ArtisticLicense">Artistic License 1.0</a></dt>
<dd>
<p>We cannot say that this is a free software license because it is too
vague; some passages are too clever for their own good, and their meaning is
not clear. We urge you to avoid using it, except as part of
<a href="#PerlLicense">the disjunctive license of Perl</a>.</p>
-<p>The problems are matters of wording, not substance. The revised
-version of the Artistic License (dubbed <a
-href="http://dev.perl.org/rfc/346.html";>Artistic License 2.0</a>) which
-is a free software license, and even compatible with the GNU GPL. This
-license is being considered for use in Perl 6. If you are thinking of
-releasing a program under the Artistic License, please do investigate
-other GPL-compatible, free software licensing options listed here
-first.</p>
-<p>The Artistic License 2.0 is currently in a draft phase with The Perl
-Foundation. FSF is in active negotiations with the Perl Foundation
-regarding the license, and we look forward to a result which will
-benefit all users.</p></dd>
+</dd>
<dt>AT&T Public License</dt>
@@ -1445,7 +1440,7 @@
<p>
Updated:
<!-- timestamp start -->
- $Date: 2007/06/29 15:43:01 $
+ $Date: 2007/07/11 13:42:56 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- licenses/gpl-faq.html 7 Jul 2007 23:58:33 -0000 1.103
+++ licenses/gpl-faq.html 11 Jul 2007 13:42:56 -0000 1.104
@@ -479,6 +479,9 @@
<li><a href="#v2v3Compatibility" name="TOCv2v3Compatibility">Is
GPLv3 compatible with GPLv2?</a></li>
+ <li><a href="#AllCompatibility" name="TOCAllCompatibility">How are the
+ various GNU licenses compatible with each other?</a></li>
+
<li><a href="#MereAggregation" name="TOCMereAggregation">What is the
difference between "mere aggregation" and "combining two modules into
one program"?</a></li>
@@ -897,9 +900,9 @@
right to redistribute copies, modified or not. You are not allowed to
distribute the work on any more restrictive basis.
<p>
-If someone asks you to sign an NDA for receiving GPL-covered
-copyright FSF, please inform the FSF immediately by writing to
address@hidden</p>
+If someone asks you to sign an NDA for receiving GPL-covered software
+copyrighted by the FSF, please inform us immediately by writing to
+<a href="mailto:address@hidden";>address@hidden</a>.</p>
<p>
If the violation involves GPL-covered code that has some other copyright
holder, please inform that copyright holder, just as you would
@@ -3001,6 +3004,218 @@
should normally still be available to modified versions, subject to the
terms in section 6 regarding access to a network.</p> </dd>
+<dt><b><a href="#TOCAllCompatibility" name="AllCompatibility">How are
+the various GNU licenses compatible with each other?</a></b></dt>
+
+<dd><p>The various GNU licenses enjoy broad compatibility between each
+other. The only time you may not be able to combine code under two of
+these licenses is when you want to use code that's <em>only</em> under an
+older version of a license with code that's under a newer version.</p>
+
+<p>Below is a detailed compatibility matrix for various combinations of the
+GNU licenses, to provide an easy-to-use reference for specific cases. It
+assumes that someone else has written some software under one of these
+licenses, and you want to somehow incorporate code from that into a project
+that you're releasing (either your own original work, or a modified version
+of someone else's GPLed software). Find the license for your own work in a
+column at the top of the table, and the license for the other code in a row
+on the left. The cell where they meet will tell you whether or not this
+combination is permitted.</p>
+
+<p>When we say "copy code," we mean just that: you're taking a section of
+code from one source, with or without modification, and inserting it into
+your own program, thus forming a work based on the first section of code.
+"Use a library" means that you're not copying any source directly, but
+instead interacting with it through linking, importing, or other typical
+mechanisms that bind the sources together when you compile or run the
+code.</p>
+
+<p><a href="#matrix-skip-target">Skip compatibility matrix</a></p>
+
+<table id="gpl-compat-matrix">
+<tbody><tr>
+<th rowspan="2" colspan="2"><br></th>
+<th colspan="6">I want to release a project under:</th>
+</tr>
+
+<tr>
+<th class="gpl-matrix-border">GPLv2 only</th>
+<th class="gpl-matrix-border">GPLv2 or later</th>
+<th class="gpl-matrix-border">GPLv3 or later</th>
+<th class="gpl-matrix-border">LGPLv2.1 only</th>
+<th class="gpl-matrix-border">LGPLv2.1 or later</th>
+<th class="gpl-matrix-border">LGPLv3 or later</th>
+</tr>
+
+<tr>
+<th rowspan="6">I want to copy code under:</th>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 or later</th>
+<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK if you upgrade to GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="ok">OK</td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
+only</th>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#comat-matrix-footnote-6">[6]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
+or later</th>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="ok">OK <a href="#comat-matrix-footnote-5">[5]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK if you upgrade and convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK if you upgrade to LGPLv3 <a
href="#comat-matrix-footnote-4">[4]</a></td>
+<td class="ok">OK</td>
+</tr>
+
+<tr class="gpl-matrix-use-type">
+<th rowspan="6">I want to use a library under:</th>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="nok">NO</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv2 or later</th>
+<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
+<td class="nok">NO</td>
+<td class="mok">OK if you upgrade to GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="ok">OK</td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1 only</th>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1 or later</th>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+<tr>
+<th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
+<td class="nok">NO</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+<td class="ok">OK</td>
+</tr>
+
+</tbody></table>
+
+<p><a href="#matrix-skip-target">Skip footnotes</a></p>
+
+<p><a name="compat-matrix-footnote-1">1</a>: You must follow the terms of
+GPLv2 when incorporating the code in this case. You cannot take advantage
+of terms in later versions of the GPL.</p>
+
+<p><a name="compat-matrix-footnote-2">2</a>: If you do this, as long as the
+project contains the code released under GPLv2 only, you will not be able
+to upgrade the project's license to GPLv3 or later.</p>
+
+<p><a name="compat-matrix-footnote-3">3</a>: If you have the ability to
+release the project under GPLv2 or any later version, you can choose to
+release it under GPLv3 or any later version—and once you do
+that, you'll be able to incorporate the code released under GPLv3.</p>
+
+<p><a name="compat-matrix-footnote-4">4</a>: If you have the ability to
+release the project under LGPLv2.1 or any later version, you can choose to
+release it under LGPLv3 or any later version—and once you
+do that, you'll be able to incorporate the code released under LGPLv3.</p>
+
+<p><a name="compat-matrix-footnote-5">5</a>: You must follow the terms of
+LGPLv2.1 when incorporating the code in this case. You cannot take
+advantage of terms in later versions of the LGPL.</p>
+
+<p><a name="compat-matrix-footnote-6">6</a>: If you do this, as long as the
+project contains the code released under LGPLv2.1 only, you will not be
+able to upgrade the project's license to LGPLv3 or later.</p>
+
+<p><a name="compat-matrix-footnote-7">7</a>: Every version of the LGPL
+gives you permission to relicense the code under the corresponding version
+(or any later version) of the GPL. If you can switch the LGPLed code in
+this case to using the GPL instead, you can make this combination.</p>
+
+<p><a name="compat-matrix-footnote-8">8</a>: Every version of the LGPL
+gives you permission to relicense the code under the corresponding version,
+or any later version, of the GPL. In these cases, you can combine the code
+if you migrate its license to GPLv3, and use GPLv3 for your own work as
+well.</p>
+
+<a name="matrix-skip-target"></a>
+</dd>
+
+
</dl>
</div>
@@ -3036,7 +3251,7 @@
<p>
Updated:
<!-- timestamp start -->
- $Date: 2007/07/07 23:58:33 $
+ $Date: 2007/07/11 13:42:56 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www gnu-new.css licenses/license-list.html lice...,
Brett Smith <=