From b65b7f99ccb8d41e62a7cdf0cf72a9e66ea25d0a Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sun, 13 Jun 2010 12:36:43 -0700
Subject: [PATCH] Changelog and upgrading-checklist for #555978

---
 debian/changelog         | 6 ++++++
 upgrading-checklist.sgml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7607d9e..a1921a0 100644
--- 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 ff36fcf..88cf3df 100644
--- 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>
-- 
2.39.5