Merge branch 'master' into bug571776-rra

diff --git a/debian/changelog b/debian/changelog
index b7b3df0e652d4ed6b3bafaf451839a6a60314335..03e6016bf5a2d6a689da1bc956a74c843a2eb222 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,17 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Cyril Brulebois <kibi@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #23712
+  * Policy: Add /run FHS exception, clarify rules for /run and /var/run
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Steve Langasek <vorlon@debian.org>
+    Seconded: Roger Leigh <rleigh@codelibre.net>
+    Closes: #620870, #532120
+  * Policy: Architecture restrictions in a dependency must be non-empty
+    Wording: Stefano Zacchiroli <zack@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Julien Cristau <jcristau@debian.org>
+    Seconded: Colin Watson <cjwatson@debian.org>
+    Closes: #498300
   * MIME Policy: Retire this document and merge it with Policy
     Wording: Ben Finney <ben+debian@benfinney.id.au>
     Seconded: Russ Allbery <rra@debian.org>
@@ -51,6 +62,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
   * Resynchronize the archive section list with ftp-master, adding
     education, introspection, and metapackages.  Patch from Charles
     Plessy.  (Closes: #651020)
+  * Clarify that packages in main may not declare Pre-Depends or
+    Build-Depends-Indep relationships outside of main either.  Partly
+    addresses #587279.
+  * Fix typo in the version numbers in the dpkg-divert examples.  Thanks,
+    Slavko.
   * Add the release date of 3.9.2.0 to upgrading-checklist.
   * Fix ordering of the last entries in the 3.9.2.0 upgrading-checklist.
   * Fix typo in upgrading-checklist entry for multiarch paths.  Thanks,

diff --git a/policy.sgml b/policy.sgml
index 1f14e34d3adf65790250a44d88e011898c8178ae..b57dd76b40903db5c051f6386b4a99d1724b1762 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,
@@ -4629,7 +4629,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
@@ -6675,6 +6675,25 @@ udeb: libz 1 zlib1g-udeb (>= 1:1.2.3.3.dfsg-1)
                   symlinked there, is relaxed to a recommendation.
                 </p>
               </item>
+             <item>
+               <p>
+                 The additional directory <file>/run</file> in the root
+                 file system is allowed.  <file>/run</file>
+                 replaces <file>/var/run</file>, and the
+                 subdirectory <file>/run/lock</file>
+                 replaces <file>/var/lock</file>, with
+                 the <file>/var</file> directories replaced by symlinks
+                 for backwards compatibility.  <file>/run</file>
+                 and <file>/run/lock</file> must follow all of the
+                 requirements in the FHS for <file>/var/run</file>
+                 and <file>/var/lock</file>, respectively, such as file
+                 naming conventions, file format requirements, or the
+                 requirement that files be cleared during the boot
+                 process.  Files and directories residing
+                 in <file>/run</file> should be stored on a temporary
+                 file system.
+               </p>
+             </item>
               <item>
                 <p>
                   The following directories in the root filesystem are
@@ -6817,6 +6836,29 @@ rmdir /usr/local/share/emacs 2>/dev/null || true
            though the spool may still be physically located there.
          </p>
        </sect1>
+
+       <sect1 id="fhs-run">
+         <heading><file>/run</file> and <file>/run/lock</file></heading>
+
+         <p>
+           The directory <file>/run</file> is cleared at boot, normally
+           by being a mount point for a temporary file system.  Packages
+           therefore must not assume that any files or directories
+           under <file>/run</file> other than <file>/run/lock</file>
+           exist unless the package has arranged to create those files or
+           directories since the last reboot.  Normally, this is done by
+           the package via an init script.  See <ref id="writing-init">
+           for more information.
+         </p>
+
+         <p>
+           Packages must not include files or directories
+           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>
 
       <sect>
@@ -7191,15 +7233,14 @@ test -f <var>program-executed-later-in-script</var> || exit 0
          </p>
 
          <p>
-           <file>/var/run</file> and <file>/var/lock</file> may be mounted
-           as temporary filesystems<footnote>
-               For example, using the <tt>RAMRUN</tt> and <tt>RAMLOCK</tt>
-               options in <file>/etc/default/rcS</file>.
-           </footnote>, so the <file>init.d</file> scripts must handle this
-           correctly. This will typically amount to creating any required
-           subdirectories dynamically when the <file>init.d</file> script
-           is run, rather than including them in the package and relying on
-           <prgn>dpkg</prgn> to create them.
+            Files and directories under <file>/run</file>, including ones
+            referred to via the compatibility paths <file>/var/run</file>
+            and <file>/var/lock</file>, are normally stored on a temporary
+            filesystem and are normally not persistent across a reboot.
+            The <file>init.d</file> scripts must handle this correctly.
+            This will typically mean creating any required subdirectories
+            dynamically when the <file>init.d</file> script is run.
+            See <ref id="fhs-run"> for more information.
          </p>
        </sect1>
 
@@ -11675,7 +11716,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

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index dc62283d8dd7be32f60159de4729c70f5350a97e..b62e5e0ecb03ea9312fdff8f7dc163123fd43ac9 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -49,6 +49,25 @@ Unreleased.
   now contain the value <tt>any all</tt> for source packages building both
   architecture-independent and architecture-dependent packages.
   </item>
+<tag>7.1</tag>
+  <item>If a dependency is restricted to particular architectures, the
+  list of architectures must be non-empty.
+  </item>
+<tag>9.1.1</tag>
+  <item><file>/run</file> is allowed as an exception to the FHS and
+  replaces <file>/var/run</file>.  <file>/run/lock</file>
+  replaces <file>/var/lock</file>.  The FHS requirements for the older
+  directories apply to these directories as well.  Backward compatibility
+  links will be maintained and packages need not switch to
+  referencing <file>/run</file> directly yet.  Files in <file>/run</file>
+  should be stored in a temporary file system.
+  </item>
+<tag>9.1.4</tag>
+  <item>New section spelling out the requirements for packages that use
+  files in <file>/run</file>, <file>/var/run</file>,
+  or <file>/var/lock</file>.  This generalizes information previously only
+  in 9.3.2.
+  </item>
 <tag>9.5</tag>
   <item>Cron job file names must not contain <tt>.</tt> or <tt>+</tt> or
   they will be ignored by cron.  They should replace those characters