Merge branch 'master' into bug347581-rra

diff --git a/debian/changelog b/debian/changelog
index 221e9d644b086d0d2098941b0f1d2374dd6dc87d..a1921a055b1d2604322bfdd55edb7e93941cf7b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,17 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     Seconded: Jakub Wilk <jwilk@debian.org>
     Seconded: gregor herrmann <gregoa@debian.org>
     Closes: #284340
+  * Policy: Document Checksums-Sha1 and Checksums-Sha256
+    Wording: Russ Allbery <rra@stanford.edu>
+    Seconded: Julien Cristau <jcristau@debian.org>
+    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
+    Closes: #478295
+  * Policy: Prohibit duplicate field names in a control paragraph
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Seconded: Steve Langasek <vorlon@debian.org>
+    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
+    Closes: #555978
   * Perl Policy: Change perlapi provides to use an ABI version
     Wording: Niko Tyni <ntyni@debian.org>
     Seconded: Russ Allbery <rra@debian.org>

diff --git a/policy.sgml b/policy.sgml
index 1e134bb30b0c6649f4e3e78204357f29d8467a28..439786cfa687ae6c01b9dd884dc49a962b80b1a8 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2404,6 +2404,11 @@ Package: libc6
          <tt>libc6</tt>.
        </p>
 
+       <p>
+         A paragraph must not contain more than one instance of a
+         particular field name.
+       </p>
+
        <p>
          Many fields' values may span several lines; in this case
          each continuation line must start with a space or a tab.
@@ -2488,8 +2493,6 @@ Package: libc6
          The syntax and semantics of the fields are described below.
        </p>
 
-<!-- stuff -->
-
        <p>
          These fields are used by <prgn>dpkg-gencontrol</prgn> to
          generate control files for binary packages (see below), by
@@ -2563,15 +2566,17 @@ Package: libc6
        <list compact="compact">
          <item><qref id="f-Format"><tt>Format</tt></qref> (mandatory)</item>
          <item><qref id="f-Source"><tt>Source</tt></qref> (mandatory)</item>
+         <item><qref id="f-Binary"><tt>Binary</tt></qref></item>
+         <item><qref id="f-Architecture"><tt>Architecture</tt></qref></item>
          <item><qref id="f-Version"><tt>Version</tt></qref> (mandatory)</item>
          <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
          <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
-         <item><qref id="f-Binary"><tt>Binary</tt></qref></item>
-         <item><qref id="f-Architecture"><tt>Architecture</tt></qref></item>
-          <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
+         <item><qref id="f-Homepage"><tt>Homepage</tt></qref></item>
          <item><qref id="f-Standards-Version"><tt>Standards-Version</tt></qref> (recommended)</item>
+         <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
+         <item><qref id="f-Checksums"><tt>Checksums-Sha1</tt>
+             and <tt>Checksums-Sha256</tt> (recommended)</item>
          <item><qref id="f-Files"><tt>Files</tt></qref> (mandatory)</item>
-         <item><qref id="f-Homepage"><tt>Homepage</tt></qref></item>
        </list>
        </p>
 
@@ -2615,6 +2620,8 @@ Package: libc6
            <item><qref id="f-Description"><tt>Description</tt></qref> (mandatory)</item>
            <item><qref id="f-Closes"><tt>Closes</tt></qref></item>
            <item><qref id="f-Changes"><tt>Changes</tt></qref> (mandatory)</item>
+           <item><qref id="f-Checksums"><tt>Checksums-Sha1</tt>
+               and <tt>Checksums-Sha256</tt> (recommended)</item>
            <item><qref id="f-Files"><tt>Files</tt></qref> (mandatory)</item>
          </list>
        </p>
@@ -3472,6 +3479,51 @@ Files:
          </p>
        </sect1>
 
+       <sect1 id="f-Checksums">
+         <heading><tt>Checksums-Sha1</tt>
+           and <tt>Checksums-Sha256</tt></heading>
+
+         <p>
+           These fields contain a list of files with a checksum and size
+           for each one.  Both <tt>Checksums-Sha1</tt>
+           and <tt>Checksums-Sha256</tt> have the same syntax and differ
+           only in the checksum algorithm used: SHA-1
+           for <tt>Checksums-Sha1</tt> and SHA-256
+           for <tt>Checksums-Sha256</tt>.
+         </p>
+
+         <p>
+           <tt>Checksums-Sha1</tt> and <tt>Checksums-Sha256</tt> are
+           multiline fields.  The first line of the field value (the part
+           on the same line as <tt>Checksums-Sha1:</tt>
+           or <tt>Checksums-Sha256:</tt>) is always empty.  The content
+           of the field is expressed as continuation lines, one line per
+           file.  Each line consists of the checksum, a space, the file
+           size, a space, and the file name.  For example (from
+           a <file>.changes</file> file):
+           <example>
+Checksums-Sha1:
+ 1f418afaa01464e63cc1ee8a66a05f0848bd155c 1276 example_1.0-1.dsc
+ a0ed1456fad61116f868b1855530dbe948e20f06 171602 example_1.0.orig.tar.gz
+ 5e86ecf0671e113b63388dac81dd8d00e00ef298 6137 example_1.0-1.debian.tar.gz
+ 71a0ff7da0faaf608481195f9cf30974b142c183 548402 example_1.0-1_i386.deb
+Checksums-Sha256:
+ ac9d57254f7e835bed299926fd51bf6f534597cc3fcc52db01c4bffedae81272 1276 example_1.0-1.dsc
+ 0d123be7f51e61c4bf15e5c492b484054be7e90f3081608a5517007bfb1fd128 171602 example_1.0.orig.tar.gz
+ f54ae966a5f580571ae7d9ef5e1df0bd42d63e27cb505b27957351a495bc6288 6137 example_1.0-1.debian.tar.gz
+ 3bec05c03974fdecd11d020fc2e8250de8404867a8a2ce865160c250eb723664 548402 example_1.0-1_i386.deb
+           </example>
+         </p>
+
+         <p>
+           In the <file>.dsc</file> file, these fields should list all
+           files that make up the source package.  In
+           the <file>.changes</file> file, these fields should list all
+           files being uploaded.  The list of files in these fields
+           must match the list of files in the <tt>Files</tt> field.
+         </p>
+       </sect1>
+
       </sect>
 
       <sect>
@@ -9265,7 +9317,7 @@ END-INFO-DIR-ENTRY
              also included in <package>base-files</package> as
              <file>/usr/share/common-licenses/BSD</file>, but given the
              brevity of this license, its specificity to code whose
-             copyright is held by the Regents of the Univesrity of
+             copyright is held by the Regents of the University of
              California, and the frequency of minor wording changes, its
              text should be included in the copyright file rather than
              referencing this file.

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 44031158aa0aeb39c16a65de490b4ef5fce7baa6..88cf3df04078444a289e292d58772a383d98860d 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -44,6 +44,15 @@ Release Jun 2010.
   <item>The required format for the date in a changelog entry and in the
   Date control field is now precisely specified.
   </item>
+<tag>5.1</tag>
+  <item>A control paragraph must not contain more than one instance of a
+  particular field name.
+  </item>
+<tag>5.4, 5.5, 5.6.24</tag>
+  <item>Document and recommend the <tt>Checksums-Sha1</tt>
+  and <tt>Checksums-Sha256</tt> fields in <file>*.dsc</file>
+  and <file>*.changes</file> files.
+  </item>
 <tag>5.6.8, 7.1, 11.1.1</tag>
   <item>Architecture wildcards may be used in addition to specific
   architectures in <file>debian/control</file> and <file>*.dsc</file>