</entry>
<entry>
Apache license
- <ulink url="http://spdx.org/licenses/ASL-1.0">1.0</ulink>,
- <ulink url="http://spdx.org/licenses/ASL-2.0">2.0</ulink>.
+ <ulink url="http://spdx.org/licenses/Apache-1.0">1.0</ulink>,
+ <ulink url="http://spdx.org/licenses/Apache-2.0">2.0</ulink>.
</entry>
</row>
<row>
CC0
</entry>
<entry>
- Creative Commons <ulink
- url="http://creativecommons.org/license/zero/">Universal
- waiver</ulink>.
+ Creative Commons Zero 1.0 Universal
+ <ulink url="http://spdx.org/licenses/CC0-1.0">1.0</ulink>.
</entry>
</row>
<row>
CDDL
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/CDDL">Common Development
- and Distribution License</ulink>.
+ Common Development and Distribution License
+ <ulink url="http://spdx.org/licenses/CDDL-1.0">1.0</ulink>.
</entry>
</row>
<row>
<ulink url="http://spdx.org/licenses/LGPL-2.1">2.1</ulink>,
<ulink url="http://spdx.org/licenses/LGPL-3.0">3.0</ulink>, or
GNU Library General Public License
- <ulink url="http://spdx.org/licenses/LGPL-1.0">1.0</ulink>,
<ulink url="http://spdx.org/licenses/LGPL-2.0">2.0</ulink>.
</entry>
</row>
GFDL
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/FDL-1.0">GNU Free
- Documentation License</ulink>.
+ GNU Free Documentation License 1.0, or
+ <ulink url="http://spdx.org/licenses/GFDL-1.1">1.1</ulink>.
</entry>
</row>
<row>
</row>
<row>
<entry>
- Python-CNRI
+ Python
</entry>
<entry>
- <ulink url="http://spdx.org/licenses/Python-CNRI">Python
- license</ulink>.
+ Python license
+ <ulink url="http://spdx.org/licenses/Python-2.0">2.0</ulink>.
</entry>
+ <!-- See https://fossbazaar.org/pipermail/spdx-legal/2011-February/000010.html -->
</row>
<row>
<entry>
Zope
</entry>
<entry>
- Zope Public License
- <ulink url="http://spdx.org/licenses/ZPL-1.0">1.0</ulink>,
+ Zope Public License 1.0,
+ <ulink url="http://spdx.org/licenses/ZPL-1.1">1.1</ulink>,
<ulink url="http://spdx.org/licenses/ZPL-2.0">2.0</ulink>,
<ulink url="http://spdx.org/licenses/ZPL-2.1">2.1</ulink>.
</entry>
Closes: #623050
* copyright-format: Update SPDX link to point to the SPDX license registry.
Patch by Charles Plessy. Closes: #628540
+ * copyright-format: Correct or add links to SPDX.
+ Wording: Charles Plessy <plessy@debian.org>
+ Seconded: Gregor Herrmann <gregoa@debian.org>
+ Closes: #641071
* Policy: Clarify that 'machine-extractable' referer the copyright
files (12.5)
Wording: Charles Plessy <plessy@debian.org>
Seconded: Raphael Hertzog <hertzog@debian.org>
Closes: #637614
- -- Bill Allombert <ballombe@debian.org> Mon, 28 Nov 2011 12:55:12 +0100
+ -- Bill Allombert <ballombe@debian.org> Wed, 30 Nov 2011 22:27:54 +0100
debian-policy (3.9.2.0) unstable; urgency=low