Add changelog and upgrading-checklist entries for #593909

diff --git a/debian/changelog b/debian/changelog
index d8f3535fe7ad7979ea9e744196ecc034ed56a5c2..f98308671af34a3affc43b4b01e7950007c8fc11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     Seconded: Steve Langasek <vorlon@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #504880
+  * Policy: Clarify format of Debian control fields
+    Wording: Charles Plessy <plessy@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Julien Cristau <jcristau@debian.org>
+    Closes: #501930, #593909
   * Virtual: Added mailx as a new virtual package
     Wording: Russ Allbery <rra@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 807fbbec0a4b80f2dd095d2bba103938e9187568..403241ccb0a875eb9308e0c2be83b8099243e36d 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -51,6 +51,19 @@ Unreleased.
   email address in <tt>Uploaders</tt> if the maintainer is a shared email
   address.  The duties of a maintainer are also clearer.
   </item>
+<tag>5</tag>
+  <item>All control fields are now classified as simple, folded, or
+  multiline, which governs whether their values must be a single line or
+  may be continued across multiple lines and whether line breaks are
+  significant.
+  </item>
+<tag>5.1</tag>
+  <item>Parsers are allowed to accept paragraph separation lines
+  containing whitespace, but control files should use completely empty
+  lines.  Ordering of paragraphs is significant.  Field names must be
+  composed of printable ASCII characters except colon and must not begin
+  with #.
+  </item>
 <tag>5.6.25</tag>
   <item>The <tt>DM-Upload-Allowed</tt> field is now documented.
   </item>