[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-6-6-gc6e6b39

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 724fa62a9288fd544f68663a62b549645e433d58
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 15:16:38 2018 +0300

    Mark qtbase5-examples and qt5-default packages as Multi-Arch: same.
    
    The arch-specific files are all on arch-specific paths.
---
 debian/changelog | 1 +
 debian/control   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4a07156..55bfc1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtbase-opensource-src (5.9.2+dfsg-7) UNRELEASED; urgency=medium
     Switch to default mode after passing them.
   * Support <triplet>-qmake -query something (closes: #886542). Thanks to
     Helmut Grohne.
+  * Mark qtbase5-examples and qt5-default packages as Multi-Arch: same.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Jan 2018 14:43:25 +0300
 
diff --git a/debian/control b/debian/control
index 040e739..74ba32e 100644
--- a/debian/control
+++ b/debian/control
@@ -427,7 +427,7 @@ Description: Qt 5 qmake Makefile generator tool
 
 Package: qtbase5-examples
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Section: x11
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 base examples
@@ -438,6 +438,7 @@ Description: Qt 5 base examples
 
 Package: qt5-default
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: qtbase5-dev, qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}
 Conflicts: qt4-default

-- 
qtbase packaging