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

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit b5dc55c879590ef860ead854c7854ece6c9e5848
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 31 05:34:03 2014 +0000

    Make qt5-qmake Multi-Arch: same since it moved from shipping files in /usr/share to /usr/lib/<triplet>.
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 69c25f3..7bfe137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtbase-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
   * Backport Add_better_support_for_keymap_update_handling.patch to improve
     keymap update handling.
 
+  [ Timo Jyrinki ]
+  * Make qt5-qmake Multi-Arch: same since it moved from shipping files in
+    /usr/share to /usr/lib/<triplet>.
+
  -- 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/control b/debian/control
index d3d97de..3bc4aa2 100644
--- a/debian/control
+++ b/debian/control
@@ -337,7 +337,7 @@ Description: Qt 5 base development programs
 
 Package: qt5-qmake
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Section: devel
 Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 qmake Makefile generator tool

-- 
qtbase packaging