Merge lp:~sil2100/ubuntu-settings-components/dep_on_right_uitk_package into lp:ubuntu-settings-components

Proposed by Łukasz Zemczak on 2016-09-22
Status: Merged
Approved by: Timo Jyrinki on 2016-09-22
Approved revision: 163
Merged at revision: 165
Proposed branch: lp:~sil2100/ubuntu-settings-components/dep_on_right_uitk_package
Merge into: lp:ubuntu-settings-components
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:~sil2100/ubuntu-settings-components/dep_on_right_uitk_package
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve on 2016-09-22
Timo Jyrinki 2016-09-22 Approve on 2016-09-22
Review via email: mp+306444@code.launchpad.net

Commit Message

Do not depend on qtdeclarative5-ubuntu-ui-toolkit-plugin* as these are transitional packages. Use qml-module-ubuntu-components* instead. This should fix issues with i386 image builds.

Description of the Change

Do not depend on qtdeclarative5-ubuntu-ui-toolkit-plugin* as these are transitional packages. Use qml-module-ubuntu-components* instead. This should fix issues with i386 image builds.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

It's good, thank you!

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:163
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/80/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2936
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2964
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2822/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2822
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2822/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-17 18:09:04 +0000
3+++ debian/control 2016-09-22 11:40:36 +0000
4@@ -44,7 +44,7 @@
5 qml-module-biometryd,
6 qml-module-qtquick-layouts,
7 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
8- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),
9+ qml-module-ubuntu-components (>= 1.1) | qml-module-ubuntu-components-gles (>= 1.1),
10 suru-icon-theme,
11 ${misc:Depends},
12 ${shlibs:Depends},

Subscribers

People subscribed via source and target branches

to all changes: