Improvements and simplifications of symbols/shlibs rewrite

[debian/debian-policy.git] / copyright-format / copyright-format.xml

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index c9b556829e813ccf17a5c05cc5bc59314af0d82d..e854c2a1464c842bcbb3262847607b5697d02503 100644 (file)
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -185,7 +185,7 @@
         <title><varname>Format</varname></title>
         <para>
           Required single line: URI of the format specification, such as:
-          <literal>http://www.debian.org/doc/copyright-format/1.0</literal>
+          <literal>http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</literal>
         </para>
       </section>
 
@@ -278,7 +278,7 @@
 
       <section id="example-header-paragraph">
         <title>Example header paragraph</title>
-<programlisting>Format: &lt;VERSIONED_FORMAT_URL&gt;
+<programlisting>Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SOFTware
 Upstream-Contact: John Doe &lt;john.doe@example.com&gt;
 Source: http://www.example.com/software/project</programlisting>
@@ -580,8 +580,8 @@ License: MPL-1.1
               </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>
@@ -710,9 +710,8 @@ License: MPL-1.1
                 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>
@@ -720,8 +719,8 @@ License: MPL-1.1
                 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>
@@ -772,7 +771,6 @@ License: MPL-1.1
                 <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>
@@ -781,8 +779,8 @@ License: MPL-1.1
                 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>
@@ -827,12 +825,13 @@ License: MPL-1.1
             </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>
@@ -869,8 +868,8 @@ License: MPL-1.1
                 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>
@@ -1072,7 +1071,7 @@ also delete it here.</programlisting>
         A possible <filename>debian/copyright</filename> file for the program
         <quote>X Solitaire</quote> distributed in the Debian source package
         <literal>xsol</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: X Solitaire
 Source: ftp://ftp.example.com/pub/games
 
@@ -1113,7 +1112,7 @@ License: GPL-2+
         A possible <filename>debian/copyright</filename> file for the program
         <quote>Planet Venus</quote>, distributed in the Debian source
         package <literal>planet-venus</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Planet Venus
 Upstream-Contact: John Doe <jdoe@example.com>
 Source: http://www.example.com/code/venus