On Mon, Mar 17, 2014 at 12:39:17AM +0100, Michael Biebl wrote: > On Mon, Mar 10, 2014 at 06:39:20PM -0400, Joey Hess wrote: > > So, I propse adding to the list of exceptions in policy section 9.1.1: > > > > The FHS requirement that architecture-independent application-specific > > static files be located in /usr/share is relaxed to a suggestion. > > > > In particular, a subdirectory of /usr/lib 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 /usr/share. > > Seconded.
So I have created a branch 'bug741304-bill' with this change. Please check the diff (in attachment). Cheers, -- Bill. <ballo...@debian.org> Imagine a large red swirl here.
commit be772247f2561c9630353d31f8869666a5e6f9db Author: Bill Allombert <bill.allomb...@math.u-bordeaux1.fr> Date: Thu Mar 20 23:55:55 2014 +0100 Policy: Relax /usr/share FHS requirement for directories with mixed content. Wording: Joey Hess <jo...@debian.org> Seconded: Russ Allbery <r...@debian.org> Seconded: Julien Cristau <jcris...@debian.org> Seconded: Jakub Wilk <jw...@debian.org> Seconded: Michael Biebl <bi...@debian.org> Closes: #741304 diff --git a/policy.sgml b/policy.sgml index f4e4281..bf959f1 100644 --- a/policy.sgml +++ b/policy.sgml @@ -6919,6 +6919,20 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1) <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 configuration files for applications are stored in the user's home directory are relaxed. It is diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml index 8f6a6b2..5292469 100644 --- 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>