Add changelog and upgrading-checklist for #218897

diff --git a/debian/changelog b/debian/changelog
index 5ccc464912f83f6f4b0c74ffdac3c2414538453f..d9854d1c3bcab79e66a5f3b8c81050cbc77f1a4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     Seconded: Julien Cristau <jcristau@debian.org>
     Seconded: Cyril Brulebois <kibi@debian.org>
     Closes: #561413
+  * Policy: Require dpkg-divert --package when adding/removing diversions
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Seconded: Raphael Geissert <geissert@debian.org>
+    Closes: #218897
   * Set the version of the Perl Policy to match the version of the Policy
     package.
   * Explain the Perl module package naming policy more explicitly and

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 1cccf596bb22e53196b9379a2f25e044bdbf907f..b8ed4dc5d545bec130fc127d0aecd38479cf007b 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -40,6 +40,11 @@ picking your way through this list.
 Not yet released.
 
 </p><p><taglist>
+<tag>3.9</tag>
+  <item>Maintainer scripts must pass <tt>--package</tt>
+  to <prgn>dpkg-divert</prgn> when creating or removing diversions and
+  must not use <tt>--local</tt>.
+  </item>
 <tag>10.2</tag>
   <item>Libtool <file>.la</file> files should not be installed for public
   libraries.  If they're required (for <tt>libltdl</tt>, for instance),