[SCM] qtbase packaging branch, master, updated. debian/5.2.1+dfsg-3-12-g5cf31aa

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=155bd0c

The following commit has been merged in the master branch:
commit 155bd0cb1217c9a6c586d73d9b9cc4cc76ff64d9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun May 4 15:09:18 2014 -0300

    Install the headers in a Multi-Arch qualified directory (Closes: #734677).
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 676e3ce..8904052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ qtbase-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
   * Build-depend on libxkbcommon-x11-dev, as the new patch includes
     <xkbcommon/xkbcommon-x11.h>.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Install the headers in a Multi-Arch qualified directory (Closes: #734677).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Mar 2014 10:10:09 -0300
 
 qtbase-opensource-src (5.2.1+dfsg-3) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 6a0e167..d32c91b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ override_dh_auto_configure:
 	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
 	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	            -docdir "/usr/share/qt5/doc" \
-	            -headerdir "/usr/include/qt5" \
+	            -headerdir "/usr/include/$(DEB_HOST_MULTIARCH)/qt5" \
 	            -datadir "/usr/share/qt5" \
 	            -archdatadir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5" \
 	            -hostdatadir "/usr/share/qt5" \

-- 
qtbase packaging