Bug#734677: more info

[Dima Kogan <dima@secretsauce.net>]

Looking at this a bit closely, I see that Debian already does MOST of
this. Most qt5 packages do have multi-arch tags. This includes both
qtbase-opensource-src and qtchooser. The -dev packages do not have these
tags, however.

I'm attaching a patch that adds those tags. I looked at the contents of
the already-built packges debian ships, and it looks like the file names
are already separate, thus adding the tags is all that is necessary.

I tried to build new packages, but there's some sort of build issue
that's tripping it up:

 $ DEB_BUILD_OPTIONS=parallel=7 dpkg-buildpackage -us -uc -b -j

 < lots of output >

 make[6]: Entering directory `/home/dima/qtbase-opensource-src-5.2.0+dfsg/src/plugins/platforms/xcb'
 /home/dima/qt5/qtbase-opensource-src-5.2.0+dfsg/bin/qmake -o Makefile.xcb-plugin xcb-plugin.pro
 make[6]: /home/dima/qt5/qtbase-opensource-src-5.2.0+dfsg/bin/qmake: Command not found

I hit this building an unreleased git HEAD off experimental, so not
reporting this as a separate bug.


>From 51a0810700aef7ae8cb02cf08c4d70a73f81cba0 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@oblong.com>
Date: Thu, 9 Jan 2014 00:27:39 -0800
Subject: [PATCH] QT5 -dev packages are now Multi-Arch:same

This is just a change in the debian/control tag, since the package contents
already used the arch-specific paths and thus didn't conflict
---
 debian/control |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/control b/debian/control
index b1401f8..940d66f 100644
--- a/debian/control
+++ b/debian/control
@@ -263,6 +263,8 @@ Description: Qt 5 print support module
 
 Package: qtbase5-dev
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
          libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
@@ -296,6 +298,8 @@ Description: Qt 5 base development files
 
 Package: qtbase5-private-dev
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}
 Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~)
@@ -311,6 +315,8 @@ Description: Qt 5 base private development files
 
 Package: libqt5opengl5-dev
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: libqt5opengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),
@@ -406,6 +412,8 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qtbase5-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
 Suggests: qt5-qmake, qtbase5-dev-tools
-- 
1.7.10.4