From 3a76ef2ca6dbf25967808a526506b2e4c1951046 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Mon, 26 Dec 2011 10:15:38 -0800
Subject: [PATCH] Changelog and upgrading-checklist for #23712

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

diff --git a/debian/changelog b/debian/changelog
index 7161430..7b4343f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Dominic Hargreaves <dom@earth.li>
     Seconded: Javier Fernández-Sanguino Peña <jfs@computer.org>
     Closes: #609162
+  * Policy: Document issues with conflicting packages sharing a conffile
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Cyril Brulebois <kibi@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Closes: #23712
   * Consistently use "Debian source control file" for *.dsc files and
     "Source package control file" for debian/control files.  Patch from
     Charles Plessy.  (Closes: #626796)
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 982f017..4f698a8 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -59,6 +59,10 @@ Unreleased.
 <tag>9.10</tag>
   <item>Packages using doc-base do not need to call install-docs anymore.
   </item>
+<tag>10.7.4</tag>
+  <item>Packages that declare the same <tt>conffile</tt> may see left-over
+  configuration files from each other even if they conflict.
+  </item>
 <tag>11.8</tag>
   <item>The Policy rules around Motif libraries were just a special case
   of normal rules for non-free dependencies and were largely obsolete, so
-- 
2.39.2