X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=0f1dbf91d54478b958992a073e77e36e7ae83867;hb=f39fe9d4bc04304a4f7f561169892faa4a4f6c5e;hp=55a33babc918a6b717950f6ae4a10f3026c7ebfe;hpb=2336a1cf44bf5c0cf4b1c2d1847098a79a548a74;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 55a33ba..0f1dbf9 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -258,7 +258,6 @@
 	    <item><ref id="fhs"></item>
 	    <item><ref id="virtual_pkg"></item>
 	    <item><ref id="menus"></item>
-	    <item><ref id="mime"></item>
 	    <item><ref id="perl"></item>
 	    <item><ref id="maintscriptprompt"></item>
 	    <item><ref id="emacs"></item>
@@ -490,9 +489,9 @@
 	      <item>
 		  must not require or recommend a package outside
 		  of <em>main</em> for compilation or execution (thus, the
-		  package must not declare a "Depends", "Recommends", or
-		  "Build-Depends" relationship on a non-<em>main</em>
-		  package),
+		  package must not declare a "Pre-Depends", "Depends",
+		  "Recommends", "Build-Depends", or "Build-Depends-Indep"
+		  relationship on a non-<em>main</em> package),
 	      </item>
 	      <item>
 		  must not be so buggy that we refuse to support them,
@@ -4629,7 +4628,7 @@ Depends: libc6 (>= 2.2.1), exim | mail-transport-agent
 	  Relationships may be restricted to a certain set of
 	  architectures.  This is indicated in brackets after each
 	  individual package name and the optional version specification.
-	  The brackets enclose a list of Debian architecture names
+	  The brackets enclose a non-empty list of Debian architecture names
 	  in the format described in <ref id="arch-spec">,
 	  separated by whitespace.  Exclamation marks may be prepended to
 	  each of the names.  (It is not permitted for some names to be
@@ -7231,6 +7230,8 @@ Reloading <var>description</var> configuration...done.
         </p>
 
 	<sect1 id="cron-files">
+	  <heading>Cron job file names</heading>
+
 	  <p>
 	    The file name of a cron job file should normally match the
 	    name of the package from which it comes.
@@ -7299,7 +7300,7 @@ Reloading <var>description</var> configuration...done.
 	  MIME (Multipurpose Internet Mail Extensions, RFCs 2045-2049)
 	  is a mechanism for encoding files and data streams and
 	  providing meta-information about them, in particular their
-	  type (e.g.  audio or video) and format (e.g. PNG, HTML,
+	  type (e.g. audio or video) and format (e.g. PNG, HTML,
 	  MP3).
 	</p>
 
@@ -7316,11 +7317,25 @@ Reloading <var>description</var> configuration...done.
 	</p>
 
 	<p>
-	  The MIME support policy can be found in the <tt>mime-policy</tt>
-	  files in the <tt>debian-policy</tt> package.
-	  It is also available from the Debian web mirrors at
-          <tt><url name="/doc/packaging-manuals/mime-policy/"
-		id="http://www.debian.org/doc/packaging-manuals/mime-policy/"></tt>.
+	  The <package>mime-support</package> package provides the
+	  <prgn>update-mime</prgn> program which allows packages to
+	  register programs that can show, compose, edit or print
+	  MIME types.
+	</p>
+
+	<p>
+	  Packages containing such programs must register them
+	  with <prgn>update-mime</prgn> as documented in <manref
+	  name="update-mime" section="8">. They should <em>not</em> depend
+	  on, recommend, or suggest <prgn>mime-support</prgn>. Instead,
+	  they should just put something like the following in the
+	  <tt>postinst</tt> and <tt>postrm</tt> scripts:
+
+	  <example>
+  if [ -x /usr/sbin/update-mime ]; then
+      update-mime
+  fi
+	  </example>
 	</p>
 
       </sect>
@@ -8215,22 +8230,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
@@ -8280,6 +8279,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>