X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=0121da51069c18300781f282e9440ebc46b88f55;hb=e18112ef9344084f6d050df6073468f7daf1606f;hp=6ae5474e01a53cb214f70e91a56ccb82591a4c93;hpb=bf7f644adeee7880cce4845867dff8f6496fd522;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 6ae5474..0121da5 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">
@@ -2696,7 +2704,7 @@ Package: libc6
 	<p>
 	  This file consists of a single paragraph, possibly surrounded by
 	  a PGP signature. The fields of that paragraph are listed below.
-	  Their syntax is described above, in <ref id="pkg-controlfields">.
+	  Their syntax is described above, in <ref id="controlsyntax">.
 
 	<list compact="compact">
 	  <item><qref id="f-Format"><tt>Format</tt></qref> (mandatory)</item>
@@ -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
@@ -6161,11 +6169,11 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
 	  <heading>File System Structure</heading>
 
 	  <p>
-	    The location of all installed files and directories must
-	    comply with the Filesystem Hierarchy Standard (FHS),
-	    version 2.3, with the exceptions noted below, and except
-	    where doing so would violate other terms of Debian
-	    Policy.  The following exceptions to the FHS apply:
+	    The location of all files and directories must comply with the
+	    Filesystem Hierarchy Standard (FHS), version 2.3, with the
+	    exceptions noted below, and except where doing so would
+	    violate other terms of Debian Policy.  The following
+	    exceptions to the FHS apply:
 
             <enumlist>
               <item>
@@ -6425,7 +6433,7 @@ rmdir /usr/local/share/emacs 2>/dev/null || true
 	  <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.
+	    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>
@@ -7960,10 +7968,12 @@ fname () {
 	<p>
 	  You may wish to restrict your script to SUSv3 features plus the
 	  above set when possible so that it may use <file>/bin/sh</file>
-	  as its interpreter. If your script works with <prgn>dash</prgn>
-	  (originally called <prgn>ash</prgn>), it probably complies with
-	  the above requirements, but if you are in doubt, use
-	  <file>/bin/bash</file>.
+	  as its interpreter.  Checking your script
+	  with <prgn>checkbashisms</prgn> from
+	  the <package>devscripts</package> package or running your script
+	  with <prgn>posh</prgn> may help uncover violations of the above
+	  requirements.  If in doubt whether a script complies with these
+	  requirements, use <file>/bin/bash</file>.
 	</p>
 
 	<p>
@@ -9913,7 +9923,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>