Merge lp:~timo-jyrinki/ubuntu-settings-components/stop_depending_on_transitional_packages into lp:~registry/ubuntu-settings-components/trunk

[Timo Jyrinki]

Stop depending on transitional packages. (LP: #1583079)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:141
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/30/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1660
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1604/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1604/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1604/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1604/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1604/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1604
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1604/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/30/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/156/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/63/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/156/rebuild

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

This is actually now required to unblock i386 xenial builds, as builders get confused when resolving the -gles parts with transitional packages. +1

review: Approve

Unmerged revisions

141. By Timo Jyrinki on 2016-05-18

Stop depending on transitional packages. (LP: #1583079)

=== modified file 'debian/control'
--- debian/control	2016-03-01 15:37:36 +0000
+++ debian/control	2016-05-18 10:30:48 +0000
@@ -10,10 +10,10 @@
                qtbase5-private-dev,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
-               qtdeclarative5-qtquick2-plugin,
-               qtdeclarative5-quicklayouts-plugin,
-               qtdeclarative5-test-plugin,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),
+               qml-module-qtquick2,
+               qml-module-qtquick-layouts,
+               qml-module-qttest,
+               qml-module-ubuntu-components (>= 1.1) | qml-module-ubuntu-components-gles (>= 1.1),
                suru-icon-theme,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-settings-components
@@ -28,7 +28,7 @@
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qml-module-qtquick-layouts,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),
+         qml-module-ubuntu-components (>= 1.1) | qml-module-ubuntu-components-gles (>= 1.1),
          suru-icon-theme,
          ${misc:Depends},
          ${shlibs:Depends},