Merge lp:~timo-jyrinki/ubuntu-system-settings/stop_depending_on_transitional_packages into lp:ubuntu-system-settings

[Timo Jyrinki]

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

[Jonas G. Drange (jonas-drange)]

LGTM, but let's do some CI on this.

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1657
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/170/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1635/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1635/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/170/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Hey Timo, looks like there's a conflict [1]. Could you maybe sync with trunk and push? I'll start a new CI-run if you're unable to.

[1] https://jenkins.canonical.com/system-apps/job/build-0-fetch/1635/console

review: Needs Fixing

[lp:~timo-jyrinki/ubuntu-system-settings/stop_depending_on_transitional_packages]

1658. By Timo Jyrinki on 2016-09-27

Merge trunk.

[Timo Jyrinki (timo-jyrinki)]

Synced. Please re-run, I could log in but can't do actions in your CI.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1658
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/172/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1637
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/389
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1637
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1483/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1483
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1483/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/172/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-09-16 15:13:17 +0000
+++ debian/control	2016-09-27 11:43:03 +0000
@@ -45,7 +45,7 @@
                dpkg-dev,
                qml-module-qttest,
                qml-module-qtquick2,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+               qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
                libubuntuoneauth-2.0-dev,
                libqtdbusmock1-dev (>= 0.2+14.04.20140724),
                libqtdbustest1-dev,
@@ -97,7 +97,7 @@
          qml-module-qtsysteminfo,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-settings-components (>= 0.8),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
+         qml-module-ubuntu-components (>= 1.3.1584) | qml-module-ubuntu-components-gles (>= 1.3.1584),
          suru-icon-theme (>= 14.04+15.04.20150813~),
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),