Fix typo in latest entry reported by Niko Tiny

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

diff --git a/policy.sgml b/policy.sgml
index a489febaa605ae786d987686b0d4f7ffe22bb27a..c5fd30586c505a1805f90e2d9b833ae2cf4a1c2e 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -6976,6 +6976,17 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
                     <tt>multiarch</tt>.
                   </footnote>
                 </p>
+                <p>
+                  The requirement for C and C++ headers files to be
+                  accessible through the search path
+                  <file>/usr/include/</file> is amended, permitting files to
+                  be accessible through the search path
+                  <file>/usr/include/<var>triplet</var></file> where
+                  <tt><var>triplet</var></tt> is as above.  <footnote>
+                    This is necessary for architecture-dependant headers
+                    file to coexist in a <tt>multiarch</tt> setup.
+                  </footnote>
+                </p>
                 <p>
                   Applications may also use a single subdirectory under
                   <file>/usr/lib/<var>triplet</var></file>.
@@ -7044,10 +7055,13 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
              </item>
              <item>
                <p>
-                 The requirement for <file>/usr/local/lib&lt;qual&gt;</file>
-                 to exist if <file>/lib&lt;qual&gt</file> or
-                 <file>/usr/lib&lt;qual&gt</file> exists is removed.
-               </p>
+                  The requirement for <file>/usr/local/lib&lt;qual&gt;</file>
+                  to exist if <file>/lib&lt;qual&gt;</file> or
+                  <file>/usr/lib&lt;qual&gt;</file> exists (where 
+                  <file>lib&lt;qual&gt;</file> is a variant of
+                  <file>lib</file> such as <file>lib32</file> or
+                  <file>lib64</file>) is removed.
+                  </p>
              </item>
              <item>
                <p>
@@ -8452,7 +8466,17 @@ fi
          renamed.  If a consensus cannot be reached, <em>both</em>
          programs must be renamed.
        </p>
-
+       <p>
+          Binary executables must not be statically linked with the GNU C
+          library, since this prevents the binary from benefiting from
+          fixes and improvements to the C library without being rebuilt
+          and complicates security updates.  This requirement may be
+          relaxed for binary executables whose intended purpose is to
+          diagnose and fix the system in situations where the GNU C
+          library may not be usable (such as system recovery shells or
+          utilities like ldconfig) or for binary executables where the
+          security benefits of static linking outweigh the drawbacks.
+       </p>
        <p>
          By default, when a package is being built, any binaries
          created should include debugging information, as well as