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

diff --git a/policy.sgml b/policy.sgml
index 8ad0613..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
@@ -7301,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>
 
@@ -7318,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>