From: Russ Allbery <rra@debian.org>
Date: Thu, 1 Jul 2010 17:36:02 +0000 (-0700)
Subject: Merge branch 'master' into bug218897-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5cd139a7743889121dcc7893b8e62e16a126a6ae;hp=a8fc858495bfbc1b6f49ef4686959aeda5f5756b;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug218897-rra
---

diff --git a/policy.sgml b/policy.sgml
index 2635fa8..64a3de3 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1214,9 +1214,11 @@
 	</p>
 
 	<p>
-	  You should not use <prgn>dpkg-divert</prgn> on a file
-	  belonging to another package without consulting the
-	  maintainer of that package first.
+	  You should not use <prgn>dpkg-divert</prgn> on a file belonging
+	  to another package without consulting the maintainer of that
+	  package first.  When adding or removing diversions, package
+	  maintainer scripts must provide the <tt>--package</tt> flag
+	  to <prgn>dpkg-divert</prgn> and must not use <tt>--local</tt>.
 	</p>
 
 	<p>