[DEP-5] [patch] License table: more links and licenses.
After looking at http://spdx.org/licenses/, I realise that the very
existence of a license list in DEP-5 is in question (not in this thread).
However, since I had a version of the DEP with a more comprehensive use
of web links for licenses, I propose the attached patch anyway.
I also propose the addition of the AGPL, Boost, GNU all permissive and NetBSD
licenses, in a separate patch.
Lastly, the different versions of some licenses could be listed explicitely, this
is the subject of the third patch.
--
Charles Plessy
Tsurumi, Kanagawa, Japan
>From 64de0647ac9940e4443d82a940fce3740c55f73b Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Sat, 14 Aug 2010 16:00:31 +0900
Subject: [PATCH 1/3] # Added back license URLs.
---
dep5.mdwn | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dep5.mdwn b/dep5.mdwn
index d12c3a3..d17333f 100644
--- a/dep5.mdwn
+++ b/dep5.mdwn
@@ -275,29 +275,29 @@ of that license, the short name is finished with a plus sign.
**keyword** | **meaning**
`Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/).
`Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
-`BSD` | Berkeley software distribution license
-`FreeBSD` | FreeBSD Project license
+`BSD` | [Berkeley software distribution](http://www.freebsd.org/copyright/license.html) license.
+`FreeBSD` | [FreeBSD](http://www.freebsd.org/copyright/freebsd-license.html) Project license.
`ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License
-`CC-BY` | Creative Commons Attribution license
-`CC-BY-SA` | Creative Commons Attribution Share Alike license
-`CC-BY-ND` | Creative Commons Attribution No Derivatives
-`CC-BY-NC` | Creative Commons Attribution Non-Commercial
-`CC-BY-NC-SA` | Creative Commons Attribution Non-Commercial Share Alike
-`CC-BY-NC-ND` | Creative Commons Attribution Non-Commercial No Derivatives
-`CC0` | Creative Commons Universal waiver
+`CC-BY` | Creative Commons [Attribution](http://creativecommons.org/licenses/by/3.0/) license.
+`CC-BY-SA` | Creative Commons [Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license.
+`CC-BY-ND` | Creative Commons [Attribution No Derivatives](http://creativecommons.org/licenses/by-nd/3.0/) license.
+`CC-BY-NC` | Creative Commons [Attribution Non-Commercial](http://creativecommons.org/licenses/by-nc/3.0/) license.
+`CC-BY-NC-SA` | Creative Commons [Attribution Non-Commercial Share Alike](http://creativecommons.org/licenses/by-nc-sa/3.0/) license.
+`CC-BY-NC-ND` | Creative Commons [Attribution Non-Commercial No Derivatives](http://creativecommons.org/licenses/by-nc-nd/3.0/) license.
+`CC0` | Creative Commons [Universal waiver](http://creativecommons.org/license/zero/).
`CDDL` | Common Development and Distribution License. For versions, consult [Sun Microsystems](http://www.sun.com/cddl/).
`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html).
`Eiffel` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
-`Expat` | The Expat license
-`GPL` | GNU General Public License
-`LGPL` | GNU Lesser General Public License, (GNU Library General Public License for versions lower than 2.1)
-`GFDL` | GNU Free Documentation License
+`Expat` | The [Expat](http://www.jclark.com/xml/copying.txt) license.
+`GPL` | GNU [General Public License](http://www.gnu.org/copyleft/gpl.html).
+`LGPL` | GNU [Lesser General Public License](http://www.gnu.org/licenses/lgpl.html) (GNU Library General Public License for versions lower than 2.1).
+`GFDL` | [GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html).
`GFDL-NIV` | GNU Free Documentation License, with no invariant sections
-`LPPL` | LaTeX Project Public License
+`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/).
`MPL` | Mozilla Public License. For versions, consult [Mozilla.org](http://www.mozilla.org/MPL)
-`Perl` | Perl license (equates to "GPL-1+ or Artistic-1")
+`Perl` | [Perl](http://dev.perl.org/licenses/) license (equates to "GPL-1+ or Artistic-1)
`PSF` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/)
-`QPL` | Q Public License
+`QPL` | [Q Public License](http://doc.trolltech.com/3.0/license.html).
`W3C-Software` | W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620S) and the [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231)
`ZLIB` | [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php)
`Zope` | Zope Public License. For versions, consult [Zope.org](http://www.zope.org/Resources/License/)
--
1.6.5.7
>From 2df4806547bb9934e0aedac9cc5535b58e663d98 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Sat, 14 Aug 2010 16:22:43 +0900
Subject: [PATCH 2/3] # Added the Boost, NetBSD, Affero GPL and GNU all permissive licenses.
---
dep5.mdwn | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dep5.mdwn b/dep5.mdwn
index d17333f..223f0da 100644
--- a/dep5.mdwn
+++ b/dep5.mdwn
@@ -276,8 +276,10 @@ of that license, the short name is finished with a plus sign.
`Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/).
`Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
`BSD` | [Berkeley software distribution](http://www.freebsd.org/copyright/license.html) license.
+`NetBSD` | [NetBSD](http://www.netbsd.org/about/redistribution.html#default) Foundation's (TNF) license.
`FreeBSD` | [FreeBSD](http://www.freebsd.org/copyright/freebsd-license.html) Project license.
`ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License
+`BSL 1.0` | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt)
`CC-BY` | Creative Commons [Attribution](http://creativecommons.org/licenses/by/3.0/) license.
`CC-BY-SA` | Creative Commons [Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license.
`CC-BY-ND` | Creative Commons [Attribution No Derivatives](http://creativecommons.org/licenses/by-nd/3.0/) license.
@@ -289,8 +291,10 @@ of that license, the short name is finished with a plus sign.
`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html).
`Eiffel` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
`Expat` | The [Expat](http://www.jclark.com/xml/copying.txt) license.
+`GAP` | [GNU All Permissive](http://www.gnu.org/licenses/license-list.html#GNUAllPermissive) license.
`GPL` | GNU [General Public License](http://www.gnu.org/copyleft/gpl.html).
`LGPL` | GNU [Lesser General Public License](http://www.gnu.org/licenses/lgpl.html) (GNU Library General Public License for versions lower than 2.1).
+`AGPL` | GNU [Affero General Public License](http://www.gnu.org/licenses/agpl.html).
`GFDL` | [GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html).
`GFDL-NIV` | GNU Free Documentation License, with no invariant sections
`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/).
--
1.6.5.7
>From a3c3c5df7b4a639aa1ca63b6b990c27af66a0743 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Sat, 14 Aug 2010 16:42:05 +0900
Subject: [PATCH 3/3] # Versionned the licenses.
---
dep5.mdwn | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dep5.mdwn b/dep5.mdwn
index 223f0da..187e3a4 100644
--- a/dep5.mdwn
+++ b/dep5.mdwn
@@ -273,13 +273,15 @@ of that license, the short name is finished with a plus sign.
[[!table data="""
**keyword** | **meaning**
-`Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/).
-`Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
+`Apache-1.0` | [Apache license version 1.0](http://www.apache.org/licenses/LICENSE-1.0.txt).
+`Apache-2.0` | [Apache license version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt).
+`Artistic-1.0` | [Artistic license version 1.0](http://www.perlfoundation.org/artistic_license_1_0).
+`Artistic-2.0` | [Artistic license version 2.0](http://www.perlfoundation.org/artistic_license_2_0).
`BSD` | [Berkeley software distribution](http://www.freebsd.org/copyright/license.html) license.
`NetBSD` | [NetBSD](http://www.netbsd.org/about/redistribution.html#default) Foundation's (TNF) license.
`FreeBSD` | [FreeBSD](http://www.freebsd.org/copyright/freebsd-license.html) Project license.
`ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License
-`BSL 1.0` | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt)
+`BSL-1.0` | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt)
`CC-BY` | Creative Commons [Attribution](http://creativecommons.org/licenses/by/3.0/) license.
`CC-BY-SA` | Creative Commons [Attribution Share Alike](http://creativecommons.org/licenses/by-sa/3.0/) license.
`CC-BY-ND` | Creative Commons [Attribution No Derivatives](http://creativecommons.org/licenses/by-nd/3.0/) license.
@@ -292,9 +294,13 @@ of that license, the short name is finished with a plus sign.
`Eiffel` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
`Expat` | The [Expat](http://www.jclark.com/xml/copying.txt) license.
`GAP` | [GNU All Permissive](http://www.gnu.org/licenses/license-list.html#GNUAllPermissive) license.
-`GPL` | GNU [General Public License](http://www.gnu.org/copyleft/gpl.html).
-`LGPL` | GNU [Lesser General Public License](http://www.gnu.org/licenses/lgpl.html) (GNU Library General Public License for versions lower than 2.1).
-`AGPL` | GNU [Affero General Public License](http://www.gnu.org/licenses/agpl.html).
+`GPL-1` | GNU [General Public License version 1](http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt).
+`GPL-2` | GNU [General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt).
+`GPL-3` | GNU [General Public License version 3](http://www.gnu.org/copyleft/gpl.txt).
+`LGPL-1 | GNU [Library General Public License version 2](http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt).
+`LGPL-2.1` | GNU [Lesser General Public License version 2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt).
+`LGPL-3` | GNU [Lesser General Public License version 3](http://www.gnu.org/licenses/lgpl.txt).
+`AGPL-3` | GNU [Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.txt).
`GFDL` | [GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html).
`GFDL-NIV` | GNU Free Documentation License, with no invariant sections
`LPPL` | [LaTeX Project Public License](http://www.latex-project.org/lppl/).
--
1.6.5.7
Reply to: