[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-3-g1d5708e

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 1d5708e28a9a447cbecb28d514503ba9c709882f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jun 29 20:10:32 2015 +0300

    Revert "Mark qt5-default as Multi-Arch: same."
    
    As Lisandro points out, this package is useful only when used with
    qtchooser of the same arch. And as qtchooser is not Multi-Arch: same,
    it does not make any sense to have qt5-default co-installed for
    different architectures.
    
    This reverts commit 19b1ee3a2e3f893d2366944e0fd5f46c37b06765.
---
 debian/changelog | 3 ---
 debian/control   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 400a34a..bfdaf28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 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 442ed03..affaada 100644
--- a/debian/control
+++ b/debian/control
@@ -434,7 +434,6 @@ 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