Add changelog and upgrading-checklist for #578854

diff --git a/debian/changelog b/debian/changelog
index 05aaff34a552605b84c90d6471514f28d8cd4055..9c61e2859a017e01c559c8e8380d875427ac2915 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     Closes: #582495
 
   [ Russ Allbery ]
+  * Policy: Overhaul Breaks, Conflicts, Provides, and Replaces
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Steve Langasek <vorlon@debian.org>
+    Seconded: Raphael Hertzog <hertzog@debian.org>
+    Closes: #578854
   * Policy: Support for architecture wildcards
     Wording: Manoj Srivastava <srivasta@debian.org>
     Wording: Russ Allbery <rra@debian.org>

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 921daa9872fdb7bfe7d662371fc2780931f72b0f..06349a5be84e4abf58abe1d79fe84c579d7d0d50 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -74,6 +74,19 @@ Release Jun 2010.
   is no controlling terminal and no reasonable default for a high-priority
   question, but should avoid this if possible.
   </item>
+<tag>7.3, 7.6.1</tag>
+  <item><tt>Breaks</tt> should be used with <tt>Replaces</tt> for moving
+  files between packages.
+  </item>
+<tag>7.4</tag>
+  <item><tt>Breaks</tt> should normally be used instead
+  of <tt>Conflicts</tt> for transient issues and moving files between
+  packages.  New documentation of when each should be used.
+  </item>
+<tag>7.5</tag>
+  <item>Use <tt>Conflicts</tt> with <tt>Provides</tt> if only one provider
+  of a virtual facility can ge installed at a time.
+  </item>
 <tag>8.4</tag>
   <item>All shared library development files are no longer required to be
   in the <tt>-dev</tt> package, only be available when the <tt>-dev</tt>