[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=5cf31aa

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

    Mark dev packages as M-A: same.
---
 debian/changelog | 2 ++
 debian/control   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b8258a7..8e78ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ qtbase-opensource-src (5.2.1+dfsg-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Install the headers in a Multi-Arch qualified directory (Closes: #734677).
     - Fix related install files.
+    - Mark qtbase5-dev, qtbase5-private-dev and libqt5opengl5-dev
+      as Multi-Arch: same.
   * Override Lintian warning about torrent.qdoc being under an RFC license,
     it's just a false positive coming from the fact that the documentation is
     listing the license, but it's really not licensed under the RFC license.
diff --git a/debian/control b/debian/control
index 4a4bac0..6eb3f76 100644
--- a/debian/control
+++ b/debian/control
@@ -264,6 +264,7 @@ Description: Qt 5 print support module
 
 Package: qtbase5-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
          libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
@@ -297,6 +298,7 @@ Description: Qt 5 base development files
 
 Package: qtbase5-private-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}
 Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~)
@@ -312,6 +314,7 @@ Description: Qt 5 base private development files
 
 Package: libqt5opengl5-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libqt5opengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),

-- 
qtbase packaging