r161 - /web/deps/dep5.mdwn

lars at users.alioth.debian.org lars at users.alioth.debian.org
Sat Jan 15 12:51:47 UTC 2011


Author: lars
Date: Sat Jan 15 12:51:46 2011
New Revision: 161

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=161
Log:
License links to SPDX, when available.

Thanks, Charles Plessy.

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=161&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Sat Jan 15 12:51:46 2011
@@ -383,35 +383,35 @@
 
 [[!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/legal)
-`BSD-2-clause` | Berkeley software distribution license, [2-clause version](http://www.freebsd.org/copyright/freebsd-license.html)
-`BSD-3-clause` | Berkeley software distribution license, [3-clause version](http://www.opensource.org/licenses/bsd-license.php)
-`BSD-4-clause` | Berkeley software distribution license, [4-clause version](http://www.freebsd.org/copyright/license.html)
-`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](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
+`Apache`       | Apache license [1.0](http://spdx.org/licenses/ASL-1.0), [2.0](http://spdx.org/licenses/ASL-2.0).
+`Artistic`     | Artistic license [1.0](http://spdx.org/licenses/Artistic-1.0), [2.0](http://spdx.org/licenses/Artistic-2.0).
+`BSD-2-clause` | Berkeley software distribution license, [2-clause version](http://spdx.org/licenses/BSD-2-Clause).
+`BSD-3-clause` | Berkeley software distribution license, [3-clause version](http://spdx.org/licenses/BSD-3-Clause).
+`BSD-4-clause` | Berkeley software distribution license, [4-clause version](http://spdx.org/licenses/BSD-4-Clause).
+`ISC`          | [Internet Software Consortium](http://spdx.org/licenses/ISC)'s license, sometimes also known as the OpenBSD License.
+`CC-BY`        | Creative Commons Attribution license [1.0](http://spdx.org/licenses/CC-BY-1.0), [2.0](http://spdx.org/licenses/CC-BY-2.0), [2.5](http://spdx.org/licenses/CC-BY-2.5), [3.0](http://spdx.org/licenses/CC-BY-3.0).
+`CC-BY-SA`     | Creative Commons Attribution Share Alike license [1.0](http://spdx.org/licenses/CC-BY-SA-1.0), [2.0](http://spdx.org/licenses/CC-BY-SA-2.0), [2.5](http://spdx.org/licenses/CC-BY-SA-2.5), [3.0](http://spdx.org/licenses/CC-BY-SA-3.0).
+`CC-BY-ND`     | Creative Commons Attribution No Derivatives license [1.0](http://spdx.org/licenses/CC-BY-ND-1.0), [2.0](http://spdx.org/licenses/CC-BY-ND-2.0), [2.5](http://spdx.org/licenses/CC-BY-ND-2.5), [3.0](http://spdx.org/licenses/CC-BY-ND-3.0).
+`CC-BY-NC`     | Creative Commons Attribution Non-Commercial license [1.0](http://spdx.org/licenses/CC-BY-NC-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-3.0).
+`CC-BY-NC-SA`  | Creative Commons Attribution Non-Commercial Share Alike license [1.0](http://spdx.org/licenses/CC-BY-NC-SA-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-SA-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-SA-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-SA-3.0).
+`CC-BY-NC-ND`  | Creative Commons Attribution Non-Commercial No Derivatives license [1.0](http://spdx.org/licenses/CC-BY-NC-ND-1.0), [2.0](http://spdx.org/licenses/CC-BY-NC-ND-2.0), [2.5](http://spdx.org/licenses/CC-BY-NC-ND-2.5), [3.0](http://spdx.org/licenses/CC-BY-NC-ND-3.0).
 `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)
-`EFL` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
+`CDDL`         | [Common Development and Distribution License](http://spdx.org/licenses/CDDL).
+`CPL`          | [IBM Common Public License](http://spdx.org/licenses/CPL-1.0).
+`EFL`          | The Eiffel Forum License [1.0](http://spdx.org/licenses/EPL-1.0).
 `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)
+`GPL`          | GNU General Public License [1.0](http://spdx.org/licenses/GPL-1.0) [2.0](http://spdx.org/licenses/GPL-2.0) [3.0](http://spdx.org/licenses/GPL-3.0).
+`LGPL`         | GNU Lesser General Public License [2.1](http://spdx.org/licenses/LGPL-2.1), [3.0](http://spdx.org/licenses/LGPL-3.0) or GNU Library General Public License [1.0](http://spdx.org/licenses/LGPL-1.0) [2.0](http://spdx.org/licenses/LGPL-2.0).
+`GFDL`         | [GNU Free Documentation License](http://spdx.org/licenses/FDL-1.0).
 `GFDL-NIV` | GNU Free Documentation License, with no invariant sections
-`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)
+`LPPL`         | [LaTeX Project Public License](http://www.latex-project.org/lppl/) [1.0](http://spdx.org/licenses/LPPL-1.0), [1.1](http://spdx.org/licenses/LPPL-1.1), [1.2](http://spdx.org/licenses/LPPL-1.2), [1.3c](http://spdx.org/licenses/LPPL-1.3c),
+`MPL` | Mozilla Public License [1.1](http://spdx.org/licenses/MPL-1.1).
 `Perl`         | [Perl](http://dev.perl.org/licenses/) license (use "GPL-1+ or Artistic-1" instead)
-`Python-CNRI` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/)
-`QPL`          | [Q Public License](http://doc.trolltech.com/3.0/license.html)
-`W3C` | W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620) 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/)
+`Python-CNRI`  | [Python license](http://spdx.org/licenses/Python-CNRI).
+`QPL`          | Q Public License [1.0](http://spdx.org/licenses/QPL-1.0).
+`W3C`          | [W3C Software License](http://spdx.org/licenses/W3C). For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620).
+`Zlib`         | [zlib/libpng license](http://spdx.org/licenses/Zlib).
+`Zope`         | Zope Public License [1.0](http://spdx.org/licenses/ZPL-1.0), [2.0](http://spdx.org/licenses/ZPL-2.0), [2.1](http://spdx.org/licenses/ZPL-2.1).
 """]]
 
 There are [many versions of the MIT 




More information about the dep-commits mailing list