Changelog and upgrading-checklist for #555978

diff --git a/debian/changelog b/debian/changelog
index 7607d9e5887ff81d1a724d39cf413613fe608137..a1921a055b1d2604322bfdd55edb7e93941cf7b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,12 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     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/upgrading-checklist.sgml b/upgrading-checklist.sgml
index ff36fcf2c028fcc47bbb97c156b553e578afabe6..88cf3df04078444a289e292d58772a383d98860d 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -44,6 +44,10 @@ 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>