All copyright files must be encoded in UTF-8

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

diff --git a/policy.sgml b/policy.sgml
index 465a1293b8b03dfe74e046d8dcb74c0af3ef2292..4fd60d909ecebd4653601bd57fefe098a5cbe656 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -1951,7 +1951,7 @@
            </tag>
            <item>
              <p>
-               A package may also provide both of the targets
+               A package may also provide one or both of the targets
                <tt>build-arch</tt> and <tt>build-indep</tt>.
                The <tt>build-arch</tt> target, if provided, should
                perform all the configuration and compilation required for
@@ -1964,9 +1964,13 @@
                architecture-independent binary packages (those packages
                for which the body of the <tt>Architecture</tt> field
                in <tt>debian/control</tt> is <tt>all</tt>).
-               The <tt>build</tt> target should depend on those of the
-               targets <tt>build-arch</tt> and <tt>build-indep</tt> that
-               are provided in the rules file.<footnote>
+             </p>
+
+             <p>
+               If <tt>build-arch</tt> or <tt>build-indep</tt> targets are
+               provided in the rules file, the <tt>build</tt> target
+               should either depend on those targets or take the same
+               actions as invoking those targets would perform.<footnote>
                  The intent of this split is so that binary-only builds
                  need not install the dependencies required for
                  the <tt>build-indep</tt> target.  However, this is not
@@ -3721,11 +3725,13 @@ Checksums-Sha256:
          <heading><tt>DM-Upload-Allowed</tt></heading>
 
          <p>
-           The most recent version of a package uploaded to unstable or
-           experimental must include the field <tt>DM-Upload-Allowed:
-           yes</tt> in the source section of its source control file for
-           the Debian archive to accept uploads signed with a key in the
-           Debian Maintainer keyring.  See the General
+           Indicates that Debian Maintainers may upload this package to
+           the Debian archive.  The only valid value is <tt>yes</tt>.  If
+           the field <tt>DM-Upload-Allowed: yes</tt> is present in the
+           source section of the source control file of the most recent
+           version of a package in unstable or experimental, the Debian
+           archive will accept uploads of this package signed with a key
+           in the Debian Maintainer keyring.  See the General
            Resolution <url id="http://www.debian.org/vote/2007/vote_003"
            name="Endorse the concept of Debian Maintainers"> for more
            details.
@@ -7974,9 +7980,10 @@ fname () {
          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>.
+         with an alternate shell such as <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>
@@ -9929,6 +9936,10 @@ END-INFO-DIR-ENTRY
          <file>README.Debian</file> or some other appropriate place.
        </p>
 
+       <p>
+         All copyright files must be encoded in UTF-8.
+       </p>
+
        <sect1 id="copyrightformat">
          <heading>Machine-readable copyright information</heading>
 
@@ -10476,10 +10487,10 @@ END-INFO-DIR-ENTRY
                  the <prgn>PATH</prgn> if necessary, and pass its
                  second and subsequent arguments to the command it
                  calls.  If no <var>root-command</var> is supplied
-                 then <var>dpkg-buildpackage</var> will take no
-                 special action to gain root privilege, so that for
-                 most packages it will have to be invoked as root to
-                 start with.</p>
+                 then <var>dpkg-buildpackage</var> will use
+                 the <prgn>fakeroot</prgn> command, which is sufficient
+                 to build most packages without actually requiring root
+                 privileges.</p>
              </item>
              <tag><tt>-b</tt>, <tt>-B</tt></tag>
              <item>