X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=fa0a390cf08308c5ed2c57886845ec64e9a66d18;hb=a455d2387d8ef592eca042366eed6247ab0d587d;hp=dad8d23272a2ea75cf109563e836900ab26f9472;hpb=3785878075453e6e3cac7dff8e7607905d24026f;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index dad8d23..fa0a390 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2367,8 +2367,7 @@ endif
           This is an optional, recommended configuration file for the
           <tt>uscan</tt> utility which defines how to automatically scan
           ftp or http sites for newly available updates of the
-          package. This is used
-          by <url id="http://dehs.alioth.debian.org/"> and other Debian QA
+          package. This is used Debian QA
           tools to help with quality control and maintenance of the
           distribution as a whole.
         </p>
@@ -6918,6 +6917,20 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 	    exceptions to the FHS apply:
 
             <enumlist>
+              <item>
+                <p>
+                The FHS requirement that architecture-independent
+                application-specific static files be located in
+                <file>/usr/share</file> is relaxed to a suggestion.
+
+                In particular, a subdirectory of <file>/usr/lib</file> may
+                be used by a package (or a collection of packages) to hold a
+                mixture of architecture-independent and
+                architecture-dependent files. However, when a directory is
+                entirely composed of architecture-independent files, it
+                should be located in <file>/usr/share</file>.
+                </p>
+              </item>
               <item>
                 <p>
                   The optional rules related to user specific
@@ -6963,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>.
@@ -7029,6 +7053,16 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 		    kernel information.</footnote>
 		</p>
 	      </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 (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>
 		  On GNU/Hurd systems, the following additional
@@ -9698,15 +9732,16 @@ done
 		Cgi-bin executable files are installed in the
 		directory
 		<example compact="compact">
-/usr/lib/cgi-bin/<var>cgi-bin-name</var>
+/usr/lib/cgi-bin
+		</example>
+		or a subdirectory of that directory, and the script
+		<example compact="compact">
+/usr/lib/cgi-bin/.../<var>cgi-bin-name</var>
 		</example>
-		or a subdirectory of that directory, and should be
-		referred to as
+		should be referred to as
 		<example compact="compact">
-http://localhost/cgi-bin/<var>cgi-bin-name</var>
+http://localhost/cgi-bin/.../<var>cgi-bin-name</var>
 		</example>
-		(possibly with a subdirectory name
-		before <var>cgi-bin-name</var>).
 	    </item>
 
 	    <item>