From: Russ Allbery <rra@debian.org>
Date: Wed, 1 Sep 2010 23:58:42 +0000 (-0700)
Subject: Merge branch 'master' into bug23712-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=de8e6ddc94be9d04836d7d1f68d1429978d14bfd;hp=20790faf456019460e8f3e2ff40f9ad2cea4721d;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug23712-rra
---

diff --git a/policy.sgml b/policy.sgml
index edd1faf..b61ab26 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -7948,22 +7948,6 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
 	<sect1>
 	  <heading>Sharing configuration files</heading>
 
-	  <p>
-	    Packages which specify the same file as a
-	    <tt>conffile</tt> must be tagged as <em>conflicting</em>
-	    with each other.  (This is an instance of the general rule
-	    about not sharing files.  Note that neither alternatives
-	    nor diversions are likely to be appropriate in this case;
-	    in particular, <prgn>dpkg</prgn> does not handle diverted
-	    <tt>conffile</tt>s well.)
-	  </p>
-
-	  <p>
-	    The maintainer scripts must not alter a <tt>conffile</tt>
-	    of <em>any</em> package, including the one the scripts
-	    belong to.
-	  </p>
-
 	  <p>
 	    If two or more packages use the same configuration file
 	    and it is reasonable for both to be installed at the same
@@ -8013,6 +7997,34 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
 	    and which manages the shared configuration files.  (The
 	    <tt>sgml-base</tt> package is a good example.)
 	  </p>
+
+	  <p>
+	    If the configuration file cannot be shared as described above,
+	    the packages must be marked as conflicting with each other.
+	    Two packages that specify the same file as
+	    a <tt>conffile</tt> must conflict.  This is an instance of the
+	    general rule about not sharing files.  Neither alternatives
+	    nor diversions are likely to be appropriate in this case; in
+	    particular, <prgn>dpkg</prgn> does not handle diverted
+	    <tt>conffile</tt>s well.
+	  </p>
+
+	  <p>
+	    When two packages both declare the same <tt>conffile</tt>, they
+	    may see left-over configuration files from each other even
+	    though they conflict with each other.  If a user removes
+	    (without purging) one of the packages and installs the other,
+	    the new package will take over the <tt>conffile</tt> from the
+	    old package.  If the file was modified by the user, it will be
+	    treated the same as any other locally
+	    modified <tt>conffile</tt> during an upgrade.
+	  </p>
+
+	  <p>
+	    The maintainer scripts must not alter a <tt>conffile</tt>
+	    of <em>any</em> package, including the one the scripts
+	    belong to.
+	  </p>
 	</sect1>
 
 	<sect1>