[SCM] qtbase packaging branch, master, updated. debian/5.4.2+dfsg-4-2-g19b1ee3

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 19b1ee3a2e3f893d2366944e0fd5f46c37b06765
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jun 29 14:43:10 2015 +0300

    Mark qt5-default as Multi-Arch: same.
    
    As it uses only multiarch location for qtchooser configuration file.
---
 debian/changelog | 3 +++
 debian/control   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bfdaf28..400a34a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.4.2+dfsg-5) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Mark qt5-default as Multi-Arch: same, as it uses only multiarch
+    location for qtchooser configuration file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
diff --git a/debian/control b/debian/control
index affaada..442ed03 100644
--- a/debian/control
+++ b/debian/control
@@ -434,6 +434,7 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: any
+Multi-Arch: same
 Depends: qtbase5-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
 Suggests: qt5-qmake, qtbase5-dev-tools

-- 
qtbase packaging