Changelog and upgrading-checklist for #402721

diff --git a/debian/changelog b/debian/changelog
index 9ef02df43d17e5f31ce572d6c1144d5f83921cd3..1bad6ea8b49b9649a6aa774522408686752cd15d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     Seconded: Guillem Jover <guillem@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #400322
+  * Policy: Say Conflicts should not be used unless necessary
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Guillem Jover <guillem@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Closes: #402721
   * 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 37830375c18f604bd26798c4c4ef23d21bc64268..6d08cc225824bf0d611f1b50e251ef62796c2975 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -50,6 +50,11 @@ Not yet released.
   package relationships provided that the binary package is not
   architecture-independent.
   </item>
+<tag>7.4</tag>
+  <item><tt>Conflicts</tt> and <tt>Breaks</tt> should only be used when
+  there are file conflicts or one package breaks the other, not just
+  because two packages provide similar functionality but don't interfere.
+  </item>
 <tag>8.6.1, 8.6.2, 8.6.5</tag>
   <item>Packages should normally not include a <file>shlibs.local</file>
   file since we now have complete <file>shlibs</file> coverage.