X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=b3c5886131b975c4ab1862746487e5de52d552a7;hb=ae016e761e423ad2e84084b77bcd132013bc2f67;hp=2d72b29f5d623cf388650653cb65bc885946b0b5;hpb=f8268e8c682f99a73c390c28c4fef5e0136582a8;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 2d72b29..b3c5886 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -279,6 +279,14 @@
 	  <tt><url name="/doc/developers-reference/"
 		id="http://www.debian.org/doc/developers-reference/"></tt>.
 	</p>
+
+	<p>
+	  Finally, a <qref id="copyrightformat">specification for
+	  machine-readable copyright files</qref> is maintained as part of
+	  the <package>debian-policy</package> package using the same
+	  procedure as the other policy documents.  Use of this format is
+	  optional.
+	</p>
       </sect>
 
       <sect id="definitions">
@@ -4628,7 +4636,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
@@ -6246,6 +6254,25 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
                   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
@@ -6388,6 +6415,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>
@@ -6762,15 +6812,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>
 
@@ -9872,7 +9921,27 @@ END-INFO-DIR-ENTRY
 	  You should not use the copyright file as a general <file>README</file>
 	  file.  If your package has such a file it should be
 	  installed in <file>/usr/share/doc/<var>package</var>/README</file> or
-	  <file>README.Debian</file> or some other appropriate place.</p>
+	  <file>README.Debian</file> or some other appropriate place.
+	</p>
+
+	<sect1 id="copyrightformat">
+	  <heading>Machine-readable copyright information</heading>
+
+	  <p>
+	    A specification for a standard, machine-readable format
+	    for <file>debian/copyright</file> files is maintained as part
+	    of the <package>debian-policy</package> package.  This
+	    document may be found in the <file>copyright-format</file>
+	    files in the <package>debian-policy</package> package.  It is
+	    also available from the Debian web mirrors at
+	    <tt><url name="/doc/packaging-manuals/copyright-format/1.0/"
+		     id="http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/"></tt>.
+	  </p>
+
+	  <p>
+	    Use of this format is optional.
+	  </p>
+	</sect1>
       </sect>
 
       <sect>