Policy: Relax FHS requirement about when /usr/local/lib<qual> should exist.

Wording: Tollef Fog Heen <tfheen@err.no>
Seconded: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Seconded: Jonathan Nieder <jrnieder@gmail.com>
Seconded: Russ Allbery <rra@debian.org>
Closes: #613143

diff --git a/debian/changelog b/debian/changelog
index 40813ae72a566bac6cc513cd6d8e0cf5f1b64013..70384c1122e94e35c5b8154fc95327623e6311cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,13 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Jakub Wilk <jwilk@debian.org>
     Seconded: Michael Biebl <biebl@debian.org>
     Closes: #741304
+  * Policy: Drop FHS requirement that /usr/local/lib<qual> exist when /lib<qual>
+    or /usr/lib<qual> does.
+    Wording: Tollef Fog Heen <tfheen@err.no>
+    Seconded: Bill Allombert <ballombe@debian.org>
+    Seconded: Jonathan Nieder <jrnieder@gmail.com>
+    Seconded: Russ Allbery <rra@debian.org>
+    Closes: #613143
   * Packaging: refreshed the names of the Policy Editors.
 
  -- Bill Allombert <ballombe@debian.org>  Thu, 01 May 2014 22:14:14 +0200

diff --git a/policy.sgml b/policy.sgml
index bf959f1250ebb1ace0393af83da4c9999eda2b41..a489febaa605ae786d987686b0d4f7ffe22bb27a 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -7042,6 +7042,13 @@ 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 is removed.
+               </p>
+             </item>
              <item>
                <p>
                  On GNU/Hurd systems, the following additional

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 5292469ee7077e3517bca5e56ddbad4db7926e42..810c8f1007cdd83004c32b21c7747753e70098ff 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -46,6 +46,10 @@ Released xxx, 2014.
   files, though directories entirely composed of architecture-independent files
   should be located in <file>/usr/share</file>.
   </item>
+<tag>9.1</tag>
+  <item>The FHS requirement for <file>/usr/local/lib64</file> to exist
+  if <file>/lib64</file> or <file>/usr/lib64</file> exists is removed.
+  </item>
 </taglist></p>
 
 <sect id="3.9.5.0"> Version 3.9.5.0