Merge lp:~cjwatson/ubuntu-ui-toolkit/arch-any into lp:ubuntu-ui-toolkit

[Colin Watson]

With Qt 5.2, QtDeclarative now supports all architectures, at least in principle. Switch back to trying to build everywhere, since ubuntu-ui-toolkit has no intrinsic reason to be non-portable.

Set Architecture back to any.

With Qt 5.2, QtDeclarative now supports all architectures, at least in principle. Switch back to trying to build everywhere, since ubuntu-ui-toolkit has no intrinsic reason to be non-portable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:968
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1851/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/799
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/799/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3349
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3349/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5718
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4590

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1851/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

This seems good, but trying to land it reveals for the moment some unfilled dependencies:

https://launchpad.net/~ci-train-ppa-service/+archive/landing-005/+sourcepub/4021171/+listing-archive-extra

-> unity-action-api -> hud -> dee-qt

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Colin Watson (cjwatson)]

Ah, I hadn't noticed those extra build-dependencies, thanks. Still,
since this will harmlessly dep-wait for now, it's safe to land this
change anyway, and it will make things clearer for people trying to work
out how to fix the problem.

[Timo Jyrinki (timo-jyrinki)]

Landed, just the qtcreator-plugin-cmake from the same landing stuck in proposed so no merge & clean ran yet.

=== modified file 'debian/control'
--- debian/control	2014-03-03 08:37:42 +0000
+++ debian/control	2014-03-07 18:39:57 +0000
@@ -49,7 +49,7 @@
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
 
 Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: libqt5qml-graphicaleffects | libqt5graphicaleffects5,
@@ -72,7 +72,7 @@
  This package contains the Ubuntu Components QML plugin.
 
 Package: ubuntu-ui-toolkit-theme
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -108,7 +108,7 @@
 
 Package: ubuntu-ui-toolkit-examples
 Section: devel
-Architecture: amd64 i386 armhf
+Architecture: any
 Depends: qmlscene,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          ubuntu-ui-toolkit-theme,