Allow /run and /run/lock, document purpose of /run

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

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index d6790aa3b85319f561586ba4a71b9770ae21ac73..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:
         <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>
 
         </para>
       </section>
 


@@ -278,7 +278,7 @@
 
       <section id="example-header-paragraph">
         <title>Example header paragraph</title>
 
       <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>
 Upstream-Name: SOFTware
 Upstream-Contact: John Doe &lt;john.doe@example.com&gt;
 Source: http://www.example.com/software/project</programlisting>


@@ -488,7 +488,7 @@ License: GPL-2
  [LICENSE TEXT]
 
 License: LGPL-2.1
  [LICENSE TEXT]
 
 License: LGPL-2.1

- LICENSE TEXT]</programlisting>
+ [LICENSE TEXT]</programlisting>

       </example>
 
       <example>
       </example>
 
       <example>


@@ -580,8 +580,8 @@ License: MPL-1.1
               </entry>
               <entry>
                 Apache license
               </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>
               </entry>
             </row>
             <row>


@@ -710,9 +710,8 @@ License: MPL-1.1
                 CC0
               </entry>
               <entry>
                 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>
               </entry>
             </row>
             <row>


@@ -720,8 +719,8 @@ License: MPL-1.1
                 CDDL
               </entry>
               <entry>
                 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>
               </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-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>
                 <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>
                 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>
               </entry>
             </row>
             <row>


@@ -827,12 +825,13 @@ License: MPL-1.1
             </row>
             <row>
               <entry>
             </row>
             <row>
               <entry>

-                Python-CNRI
+                Python

               </entry>
               <entry>
               </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>
               </entry>

+              <!-- See https://fossbazaar.org/pipermail/spdx-legal/2011-February/000010.html -->

             </row>
             <row>
               <entry>
             </row>
             <row>
               <entry>


@@ -869,8 +868,8 @@ License: MPL-1.1
                 Zope
               </entry>
               <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>
                   <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>


@@ -885,10 +884,22 @@ License: MPL-1.1
         matches.
       </para>
       <para>
         matches.
       </para>
       <para>

-        Exceptions and clarifications are signaled in plain text, by appending
+        An exception or clarification to a license is signaled in plain text, by appending

         <literal>with <varname><replaceable>keywords</replaceable></varname>
         exception</literal> to the short name.  This document provides a list of
         <literal>with <varname><replaceable>keywords</replaceable></varname>
         exception</literal> to the short name.  This document provides a list of

-        keywords that refer to the most frequent exceptions.
+        keywords that must be used when referring to the most frequent
+        exceptions.  When exceptions other than these are in effect that modify
+        a common license by granting additional permissions, you may use an
+        arbitrary keyword not taken from the below list of keywords.  When a
+        license differs from a common license because of added restrictions
+        rather than because of added permissions, a distinct short name should
+        be used instead of <literal>with
+        <varname><replaceable>keywords</replaceable></varname>exception</literal>.
+      </para>
+      <para>
+        Only one exception may be specified for each license within a given
+        license specification.  If more than one exception applies to a single
+        license, an arbitrary short name must be used instead.

       </para>
       <para>
         The GPL <literal>Font</literal> exception refers to the text added to the
       </para>
       <para>
         The GPL <literal>Font</literal> exception refers to the text added to the


@@ -1060,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>:
         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
 
 Upstream-Name: X Solitaire
 Source: ftp://ftp.example.com/pub/games
 


@@ -1090,7 +1101,7 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith@example.net>

-License:
+License: GPL-2+

  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>
  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>


@@ -1101,7 +1112,7 @@ License:
         A possible <filename>debian/copyright</filename> file for the program
         <quote>Planet Venus</quote>, distributed in the Debian source
         package <literal>planet-venus</literal>:
         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
 Upstream-Name: Planet Venus
 Upstream-Contact: John Doe <jdoe@example.com>
 Source: http://www.example.com/code/venus


@@ -1116,7 +1127,7 @@ License: PSF-2
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan@debian.example.com>
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan@debian.example.com>

-License:
+License: permissive

  Copying and distribution of this package, with or without
  modification, are permitted in any medium without royalty
  provided the copyright notice and this notice are
  Copying and distribution of this package, with or without
  modification, are permitted in any medium without royalty
  provided the copyright notice and this notice are