r219 - in /web/deps: ./ dep5/copyright-format.xml dep5/index.html
vorlon at users.alioth.debian.org
vorlon at users.alioth.debian.org
Thu Dec 1 00:45:05 UTC 2011
Author: vorlon
Date: Thu Dec 1 00:45:04 2011
New Revision: 219
URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=219
Log:
final sync from debian-policy
Modified:
web/deps/ (props changed)
web/deps/dep5/copyright-format.xml
web/deps/dep5/index.html
Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=219&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Thu Dec 1 00:45:04 2011
@@ -577,8 +577,8 @@
</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>
@@ -707,9 +707,8 @@
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>
@@ -717,8 +716,8 @@
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>
@@ -769,7 +768,6 @@
<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>
@@ -778,8 +776,8 @@
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>
@@ -824,12 +822,13 @@
</row>
<row>
<entry>
- Python-CNRI
- </entry>
- <entry>
- <ulink url="http://spdx.org/licenses/Python-CNRI">Python
- license</ulink>.
- </entry>
+ Python
+ </entry>
+ <entry>
+ 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>
@@ -866,8 +865,8 @@
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>
Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=219&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Thu Dec 1 00:45:04 2011
@@ -753,9 +753,9 @@
<td>Apache</td>
<td>Apache license <a href=
- "http://spdx.org/licenses/ASL-1.0" target=
+ "http://spdx.org/licenses/Apache-1.0" target=
"_top">1.0</a>, <a href=
- "http://spdx.org/licenses/ASL-2.0" target=
+ "http://spdx.org/licenses/Apache-2.0" target=
"_top">2.0</a>.</td>
</tr>
@@ -893,17 +893,17 @@
<tr>
<td>CC0</td>
- <td>Creative Commons <a href=
- "http://creativecommons.org/license/zero/" target=
- "_top">Universal waiver</a>.</td>
+ <td>Creative Commons Zero 1.0 Universal <a href=
+ "http://spdx.org/licenses/CC0-1.0" target=
+ "_top">1.0</a>.</td>
</tr>
<tr>
<td>CDDL</td>
- <td><a href="http://spdx.org/licenses/CDDL" target=
- "_top">Common Development and Distribution
- License</a>.</td>
+ <td>Common Development and Distribution License
+ <a href="http://spdx.org/licenses/CDDL-1.0" target=
+ "_top">1.0</a>.</td>
</tr>
<tr>
@@ -951,18 +951,16 @@
"_top">2.1</a>, <a href=
"http://spdx.org/licenses/LGPL-3.0" target=
"_top">3.0</a>, or GNU Library General Public
- License <a href="http://spdx.org/licenses/LGPL-1.0"
- target="_top">1.0</a>, <a href=
- "http://spdx.org/licenses/LGPL-2.0" target=
- "_top">2.0</a>.</td>
+ License <a href="http://spdx.org/licenses/LGPL-2.0"
+ target="_top">2.0</a>.</td>
</tr>
<tr>
<td>GFDL</td>
- <td><a href="http://spdx.org/licenses/FDL-1.0"
- target="_top">GNU Free Documentation
- License</a>.</td>
+ <td>GNU Free Documentation License 1.0, or <a href=
+ "http://spdx.org/licenses/GFDL-1.1" target=
+ "_top">1.1</a>.</td>
</tr>
<tr>
@@ -1005,10 +1003,11 @@
</tr>
<tr>
- <td>Python-CNRI</td>
-
- <td><a href="http://spdx.org/licenses/Python-CNRI"
- target="_top">Python license</a>.</td>
+ <td>Python</td>
+
+ <td>Python license <a href=
+ "http://spdx.org/licenses/Python-2.0" target=
+ "_top">2.0</a>.</td>
</tr>
<tr>
@@ -1039,9 +1038,9 @@
<tr>
<td>Zope</td>
- <td>Zope Public License <a href=
- "http://spdx.org/licenses/ZPL-1.0" target=
- "_top">1.0</a>, <a href=
+ <td>Zope Public License 1.0, <a href=
+ "http://spdx.org/licenses/ZPL-1.1" target=
+ "_top">1.1</a>, <a href=
"http://spdx.org/licenses/ZPL-2.0" target=
"_top">2.0</a>, <a href=
"http://spdx.org/licenses/ZPL-2.1" target=
@@ -1268,7 +1267,7 @@
"examples">Examples</a></h2>
<div class="example">
- <a name="AEN464" id="AEN464"></a>
+ <a name="AEN463" id="AEN463"></a>
<p><b>Example 3. Simple</b></p>
@@ -1313,7 +1312,7 @@
</div>
<div class="example">
- <a name="AEN471" id="AEN471"></a>
+ <a name="AEN470" id="AEN470"></a>
<p><b>Example 4. Complex</b></p>
More information about the dep-commits
mailing list