From f3f0c614c7bc3d3454daca11ca59cb9f18f59319 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sat, 3 Jul 2010 11:05:07 -0700
Subject: [PATCH] Add changelog and upgrading-checklist for #218897

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

diff --git a/debian/changelog b/debian/changelog
index 5ccc464..d9854d1 100644
--- 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 1cccf59..b8ed4dc 100644
--- 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),
-- 
2.39.5