From 65c8cb9c9f910dbc55405b09817091894fe8e584 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 7 Jul 2010 08:52:11 -0700 Subject: [PATCH] Changelog and upgrading-checklist for #402721 --- debian/changelog | 5 +++++ upgrading-checklist.sgml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9ef02df..1bad6ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,11 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low Seconded: Guillem Jover Seconded: Raphaël Hertzog Closes: #400322 + * Policy: Say Conflicts should not be used unless necessary + Wording: Russ Allbery + Seconded: Guillem Jover + Seconded: Jakub Wilk + 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 3783037..6d08cc2 100644 --- 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. +7.4 + Conflicts and Breaks 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. + 8.6.1, 8.6.2, 8.6.5 Packages should normally not include a shlibs.local file since we now have complete shlibs coverage. -- 2.39.5