From a455d2387d8ef592eca042366eed6247ab0d587d Mon Sep 17 00:00:00 2001
From: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Date: Mon, 19 May 2014 19:34:19 +0200
Subject: [PATCH 1/1] Policy: Grant an FHS exception for the multiarch headers
 directories

Wording Bill Allombert <ballombe@debian.org>
Seconded: Jonathan Nieder <jrnieder@gmail.com>
Seconded: Russ Allbery <rra@debian.org>
Closes: #742756
---
 debian/changelog         |  7 ++++++-
 policy.sgml              | 11 +++++++++++
 upgrading-checklist.sgml |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ac2165a..c1b4ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Russ Allbery <rra@debian.org>
     Seconded: Damyan Ivanov <dmn@debian.org>
     Closes: #748479
+  * Policy: Grant an FHS exception for the multiarch headers directories
+    Wording Bill Allombert <ballombe@debian.org>
+    Seconded: Jonathan Nieder <jrnieder@gmail.com>
+    Seconded: Russ Allbery <rra@debian.org>
+    Closes: #742756
   * Packaging: refreshed the names of the Policy Editors.
 
   [ Jonathan Nieder ]
@@ -38,7 +43,7 @@ debian-policy (3.9.6.0) unstable; urgency=low
     Seconded: Russ Allbery <rra@debian.org>
     Closes: #613143
 
- -- Bill Allombert <ballombe@debian.org>  Sat, 17 May 2014 18:49:57 +0200
+ -- Bill Allombert <ballombe@debian.org>  Fri, 30 May 2014 11:55:39 +0200
 
 debian-policy (3.9.5.0) unstable; urgency=low
 
diff --git a/policy.sgml b/policy.sgml
index bd9eb73..fa0a390 100644
--- 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>.
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 810c8f1..592dad8 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -50,6 +50,11 @@ Released xxx, 2014.
   <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>
+<tag>9.1.1</tag>
+  <item> An FHS exception has been granted for multiarch include files,
+  permitting header files to instead be installed to
+  <file>/usr/include/triplet</file>.
+  </item>
 </taglist></p>
 
 <sect id="3.9.5.0"> Version 3.9.5.0
-- 
2.39.2