Merge lp:~jonas-drange/ubuntu-settings-components/fix-uitk-dep into lp:~registry/ubuntu-settings-components/trunk

Proposed by Jonas G. Drange
Status: Needs review
Proposed branch: lp:~jonas-drange/ubuntu-settings-components/fix-uitk-dep
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 27 lines (+3/-3)
1 file modified
debian/control (+3/-3)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-settings-components/fix-uitk-dep
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+289024@code.launchpad.net

Commit message

running ci

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Approve (continuous-integration)

Unmerged revisions

112. By Jonas G. Drange

bump uitk dep

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-10-20 11:52:12 +0000
+++ debian/control 2016-03-15 09:26:33 +0000
@@ -12,7 +12,7 @@
12 qtdeclarative5-dev-tools,12 qtdeclarative5-dev-tools,
13 qtdeclarative5-qtquick2-plugin,13 qtdeclarative5-qtquick2-plugin,
14 qtdeclarative5-test-plugin,14 qtdeclarative5-test-plugin,
15 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),15 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
16 suru-icon-theme,16 suru-icon-theme,
17Standards-Version: 3.9.417Standards-Version: 3.9.4
18Homepage: https://launchpad.net/ubuntu-settings-components18Homepage: https://launchpad.net/ubuntu-settings-components
@@ -27,11 +27,11 @@
27Multi-Arch: same27Multi-Arch: same
28Pre-Depends: dpkg (>= 1.15.6~)28Pre-Depends: dpkg (>= 1.15.6~)
29Depends: qml-module-qtquick-layouts,29Depends: qml-module-qtquick-layouts,
30 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),30 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
31 suru-icon-theme,31 suru-icon-theme,
32 ${misc:Depends},32 ${misc:Depends},
33 ${shlibs:Depends},33 ${shlibs:Depends},
34Breaks: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),34Breaks: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
35Replaces: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),35Replaces: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
36Description: Ubuntu Settings Components36Description: Ubuntu Settings Components
37 Ubuntu settings components for Unity
38\ No newline at end of file37\ No newline at end of file
38 Ubuntu settings components for Unity

Subscribers

People subscribed via source and target branches

to all changes: