Merge lp:~laney/kubuntu-packaging/qt5-qmake-ma-same into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

[Iain Lane]

Make qt5-qmake Multi-Arch: same since it moved from shipping files in /usr/share to /usr/lib/<triplet>.

Make qt5-qmake Multi-Arch: same since it moved from shipping files in /usr/share to /usr/lib/<triplet>.

[Iain Lane (laney)]

(Resubmitted to add the prerequisite branch)

[Timo Jyrinki (timo-jyrinki)]

Looks good to me considering the current contents of qt5-qmake after mkspecs moved to arch specific dirs.

Landing to be done via CI Train.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:163
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/kubuntu-packaging/qt5-qmake-ma-same/+merge/211509/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-amd64-ci/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-armhf-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/31/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/kubuntu-packaging/qt5-qmake-ma-same/+merge/211509/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-armhf-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/32/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

In archives now, let's try to give CI a possibility to merge.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-amd64-autolanding/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-18 06:00:58 +0000
+++ debian/changelog	2014-03-18 12:41:19 +0000
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.2.1+dfsg-1ubuntu10) UNRELEASED; urgency=medium
+
+  * Make qt5-qmake Multi-Arch: same since it moved from shipping files in
+    /usr/share to /usr/lib/<triplet>.
+
+ -- Iain Lane <[e-mail]>  Tue, 18 Mar 2014 12:41:00 +0000
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu9) trusty; urgency=medium
 
   * debian/patches/Fix-access-after-delete-with-Harfbuzz-NG-code-path.patch

=== modified file 'debian/control'
--- debian/control	2014-03-03 18:50:27 +0000
+++ debian/control	2014-03-18 12:41:19 +0000
@@ -346,7 +346,7 @@
 
 Package: qt5-qmake
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Section: devel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}