Merge branch 'master' into bug104373-rra

diff --combined policy.sgml
index 5132ab2bff0c899e47013c34ebadb32f9fa2971f,316f7533034207321ccf0aeddb12d9aa45aa0c2a..1bc7addce5a411a5d902cebb0888821e9c9e2e17
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -4373,21 -4373,24 +4373,24 @@@ Depends: libc6 (>= 2.2.1), exim | mail-
        </p>
  
          <p>
-           All fields that specify build-time relationships
+         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
+         separated by whitespace.  Exclamation marks may be prepended to
+         each of the names.  (It is not permitted for some names to be
+         prepended with exclamation marks while others aren't.)
+       </p>
+ 
+       <p>
+         For build relationship fields
          (<tt>Build-Depends</tt>, <tt>Build-Depends-Indep</tt>,
-         <tt>Build-Conflicts</tt> and <tt>Build-Conflicts-Indep</tt>)
-         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 separated by whitespace.
-         Exclamation marks may be prepended to each of the names.
-         (It is not permitted for some names to be prepended with
-         exclamation marks while others aren't.) If the current Debian
-         host architecture is not in this list and there are no
-         exclamation marks in the list, or it is in the list with a
-         prepended exclamation mark, the package name and the
-         associated version specification are ignored completely for
-         the purposes of defining the relationships.
+         <tt>Build-Conflicts</tt> and <tt>Build-Conflicts-Indep</tt>), if
+         the current Debian host architecture is not in this list and
+         there are no exclamation marks in the list, or it is in the list
+         with a prepended exclamation mark, the package name and the
+         associated version specification are ignored completely for the
+         purposes of defining the relationships.
        </p>
  
        <p>
@@@ -4403,6 -4406,29 +4406,29 @@@ Build-Depends: kernel-headers-2.2.10 [!
          <tt>gnumach-dev</tt> only on hurd-i386.
        </p>
  
+       <p>
+         For binary relationship fields, the architecture restriction
+         syntax is only supported in the source package control
+         file <file>debian/control</file>.  When the corresponding binary
+         package control file is generated, the relationship will either
+         be omitted or included without the architecture restriction
+         based on the architecture of the binary package.  This means
+         that architecture restrictions must not be used in binary
+         relationship fields for architecture-independent packages
+         (<tt>Architecture: all</tt>).
+       </p>
+ 
+       <p>
+         For example:
+         <example compact="compact">
+ Depends: foo [i386], bar [amd64]
+         </example>
+         becomes <tt>Depends: foo</tt> when the package is built on
+         the <tt>i386</tt> architecture, <tt>Depends: bar</tt> when the
+         package is built on the <tt>amd64</tt> architecture, and omitted
+         entirely in binary packages built on all other architectures.
+       </p>
+ 
        <p>
          If the architecture-restricted dependency is part of a set of
          alternatives using <tt>|</tt>, that alternative is ignored
@@@ -4417,11 -4443,11 +4443,11 @@@ Build-Depends: foo [!i386] | bar [!amd6
        </p>
  
          <p>
-         All fields that specify build-time relationships may also be
-         restricted to a certain set of architectures using architecture
-         wildcards.  The syntax for declaring such restrictions is the
-         same as declaring restrictions using a certain set of
-         architectures without architecture wildcards.  For example:
+         Relationships may also be restricted to a certain set of
+         architectures using architecture wildcards.  The syntax for
+         declaring such restrictions is the same as declaring
+         restrictions using a certain set of architectures without
+         architecture wildcards.  For example:
            <example compact="compact">
  Build-Depends: foo [linux-any], bar [any-i386], baz [!linux-any]
            </example>
@@@ -5477,8 -5503,8 +5503,8 @@@ Replaces: mail-transport-agen
                unusual situations to work around bugs in other packages,
                or in unusual cases where the normally declared dependency
                information in the installed <file>shlibs</file> file for
-               a library cannot be used.  The contents of this file
-               override information obtained from any other source.
+               a library cannot be used.  This file overrides information
+               obtained from any other source.
              </p>
            </item>
  
@@@ -8298,13 -8324,11 +8324,13 @@@ don
                <example compact="compact">
  /usr/lib/cgi-bin/<var>cgi-bin-name</var>
                </example>
 -              and should be referred to as
 +              or a subdirectory of that directory, and should be
 +              referred to as
                <example compact="compact">
  http://localhost/cgi-bin/<var>cgi-bin-name</var>
                </example>
 -
 +              (possibly with a subdirectory name
 +              before <var>cgi-bin-name</var>).
            </item>
  
            <item>