Merge branch 'master' into bug620870-rra

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 78c39053986e5758f036b0017680d84e862ce274..6ae5474e01a53cb214f70e91a56ccb82591a4c93 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -489,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,
@@ -6266,13 +6266,13 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
                </p>
              </item>
               <item>
-               <p>
-                 The following directories in the root filesystem are
-                 additionally allowed: <file>/sys</file> and
-                 <file>/selinux</file>. <footnote>These directories
-                 are used as mount points to mount virtual filesystems
-                 to get access to kernel information.</footnote>
-               </p>
+                <p>
+                  The following directories in the root filesystem are
+                  additionally allowed: <file>/sys</file> and
+                  <file>/selinux</file>. <footnote>These directories
+                  are used as mount points to mount virtual filesystems
+                  to get access to kernel information.</footnote>
+                </p>
               </item>
              <item>
                <p>
@@ -6424,16 +6424,10 @@ rmdir /usr/local/share/emacs 2>/dev/null || true
 
          <p>
            Packages must not include files or directories
-           under <file>/run</file>, or under the <file>/var/run</file>
-           or <file>/var/lock</file> paths that are replaced with
-           symlinks or bind mounts to <file>/run</file> for backwards
-           compatibility.
-         </p>
-
-         <p>
-           Packages should use <file>/run</file> in preference
-           to <file>/var/run</file> and <file>/run/lock</file> in
-           preference to <file>/var/lock</file>.
+           under <file>/run</file>, or under the
+           older <file>/var/run</file> and <file>/var/lock<file> paths.
+           The latter paths will normally be symlinks or other
+           redirections to <file>/run</file> for backwards compatibility.
          </p>
        </sect1>
       </sect>
@@ -11375,7 +11369,7 @@ END-INFO-DIR-ENTRY
      dpkg-divert --package smailwrapper --remove --rename \
         --divert /usr/sbin/smail.real /usr/sbin/smail
   fi
-       </example> where <tt>1.02-2</tt> is the version at which the
+       </example> where <tt>1.0-2</tt> is the version at which the
        diversion was first added to the package.  The postrm should not
        remove the diversion on upgrades both because there's no reason to
        remove the diversion only to immediately re-add it and since the