Policy: Relax /usr/share FHS requirement for directories with mixed content.

Wording: Joey Hess <joeyh@debian.org>
Seconded: Russ Allbery <rra@debian.org>
Seconded: Julien Cristau <jcristau@debian.org>
Seconded: Jakub Wilk <jwilk@debian.org>
Seconded: Michael Biebl <biebl@debian.org>
Closes: #741304

diff --git a/debian/changelog b/debian/changelog
index e166917ac4d37005595df1e138c0c16b9298ebb8..40813ae72a566bac6cc513cd6d8e0cf5f1b64013 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,16 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Julian Gilbey <julian@d-and-j.net>
     Seconded: Charles Plessy <plessy@debian.org>
     Closes: #731810
+  * Policy: Relax /usr/share FHS requirement for directories with mixed content.
+    Wording: Joey Hess <joeyh@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Julien Cristau <jcristau@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Seconded: Michael Biebl <biebl@debian.org>
+    Closes: #741304
   * Packaging: refreshed the names of the Policy Editors.
 
- -- Bill Allombert <ballombe@debian.org>  Thu, 27 Feb 2014 18:08:18 +0100
+ -- Bill Allombert <ballombe@debian.org>  Thu, 01 May 2014 22:14:14 +0200
 
 debian-policy (3.9.5.0) unstable; urgency=low
 

diff --git a/policy.sgml b/policy.sgml
index f4e428149dad17f7477142466ca9279b32c31522..bf959f1250ebb1ace0393af83da4c9999eda2b41 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -6917,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

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 8f6a6b2e0d4f8c031d118e6aa8a50f33e7cfe67d..5292469ee7077e3517bca5e56ddbad4db7926e42 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -34,6 +34,20 @@ picking your way through this list.
 
 <chapt> The checklist
 
+<sect id="3.9.6.0"> Version 3.9.6.0
+<p>
+
+Released xxx, 2014.
+
+</p><p><taglist>
+<tag>9.1</tag>
+  <item> The FHS is relaxed to allow a subdirectory of <file>/usr/lib</file>
+  to hold a mixture of architecture-independent and architecture-dependent
+  files, though directories entirely composed of architecture-independent files
+  should be located in <file>/usr/share</file>.
+  </item>
+</taglist></p>
+
 <sect id="3.9.5.0"> Version 3.9.5.0
 <p>