copyright-format: Specify URL on www.debian.org

Wording: Charles Plessy <plessy@debian.org>
Seconded: David Prévot <taffit@debian.org>
Seconded: Gregor Herrmann <gregoa@debian.org>
Closes: #640737

diff --git a/README.org b/README.org
index b2c4b6f7007a2636d62f801e1ab22c361d1bd0b8..2be9c515d3332dc907a64444090a27afd65a4c5a 100644 (file)
--- a/README.org
+++ b/README.org
@@ -138,7 +138,7 @@ published at [[http://www.debian.org/doc/]].
 
 In addition to the main technical manual, the team currently also maintains:
 
-+ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0][Machine-readable debian/copyright format]]
++ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/][Machine-readable debian/copyright format]]
 + [[http://www.debian.org/doc/packaging-manuals/menu-policy/][Debian Menu sub-policy]]
 + [[http://www.debian.org/doc/packaging-manuals/perl-policy/][Debian Perl Policy]]
 + [[http://www.debian.org/doc/packaging-manuals/mime-policy/][Debian MIME support sub-policy]]

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index c9b556829e813ccf17a5c05cc5bc59314af0d82d..4c18c3ba27b7cde71eeb28fcd48ba2f04ec98239 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>
@@ -1072,7 +1072,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 +1113,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

diff --git a/debian/changelog b/debian/changelog
index 3654b0b9178cb08accf2413b6194232c9a954297..dc65fc3e3719f0e0cb483e98843e1fd85b74b743 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Jakub Wilk <jwilk@debian.org>
     Seconded: Jonas Smedegaard <dr@jones.dk>
     Closes: #633797
+  * copyright-format: Specify URL on www.debian.org
+    Wording: Charles Plessy <plessy@debian.org>
+    Seconded: David Prévot <taffit@debian.org>
+    Seconded: Gregor Herrmann <gregoa@debian.org>
+    Closes: #640737
   * Perl policy: Document major version upgrade trigger
     Wording: Dominic Hargreaves <dom@debian.org>
     Seconded: Russ Allbery <rra@debian.org>