Reference copyright-format from Debian Policy

diff --git a/policy.sgml b/policy.sgml
index 8100da082bd123ab85cf97a6788b5cd656b99cb4..b3c5886131b975c4ab1862746487e5de52d552a7 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -279,6 +279,14 @@
          <tt><url name="/doc/developers-reference/"
                id="http://www.debian.org/doc/developers-reference/"></tt>.
        </p>
+
+       <p>
+         Finally, a <qref id="copyrightformat">specification for
+         machine-readable copyright files</qref> is maintained as part of
+         the <package>debian-policy</package> package using the same
+         procedure as the other policy documents.  Use of this format is
+         optional.
+       </p>
       </sect>
 
       <sect id="definitions">
@@ -9913,7 +9921,27 @@ END-INFO-DIR-ENTRY
          You should not use the copyright file as a general <file>README</file>
          file.  If your package has such a file it should be
          installed in <file>/usr/share/doc/<var>package</var>/README</file> or
-         <file>README.Debian</file> or some other appropriate place.</p>
+         <file>README.Debian</file> or some other appropriate place.
+       </p>
+
+       <sect1 id="copyrightformat">
+         <heading>Machine-readable copyright information</heading>
+
+         <p>
+           A specification for a standard, machine-readable format
+           for <file>debian/copyright</file> files is maintained as part
+           of the <package>debian-policy</package> package.  This
+           document may be found in the <file>copyright-format</file>
+           files in the <package>debian-policy</package> package.  It is
+           also available from the Debian web mirrors at
+           <tt><url name="/doc/packaging-manuals/copyright-format/1.0/"
+                    id="http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/"></tt>.
+         </p>
+
+         <p>
+           Use of this format is optional.
+         </p>
+       </sect1>
       </sect>
 
       <sect>

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index b62e5e0ecb03ea9312fdff8f7dc163123fd43ac9..7d5016a3b35411404cbd7e3946fc6933c53f02ed 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -92,6 +92,10 @@ Unreleased.
   Debian maintainers involved in the creation of the package (although
   note that the requirement to list copyright information is unchanged).
   </item>
+<tag>copyright-format</tag>
+  <item>Version 1.0 of the "Machine-readable <file>debian/copyright</file>
+  file" specification is included.
+  </item>
 <tag>mime</tag>
   <item>Retire this separate document and merge its (short) contents into
   Policy section 9.7.  There are no changes to the requirements.