ubuntu-system-settings

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

  1. stop_depending_on_transitional_packages
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1658
Merged at revision: 1734
Proposed branch: lp:~timo-jyrinki/ubuntu-system-settings/stop_depending_on_transitional_packages
Merge into: lp:ubuntu-system-settings
Diff against target: 21 lines (+2/-2)
1 file modified
debian/control (+2/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-system-settings/stop_depending_on_transitional_packages
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Jonas G. Drange (community) Needs Fixing
PS Jenkins bot continuous-integration Pending
Review via email: mp+295048@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

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

review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

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 updated
1658. By Timo Jyrinki

Merge trunk.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

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)

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-09-16 15:13:17 +0000
3+++ debian/control 2016-09-27 11:43:03 +0000
4@@ -45,7 +45,7 @@
5 dpkg-dev,
6 qml-module-qttest,
7 qml-module-qtquick2,
8- qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
9+ qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
10 libubuntuoneauth-2.0-dev,
11 libqtdbusmock1-dev (>= 0.2+14.04.20140724),
12 libqtdbustest1-dev,
13@@ -97,7 +97,7 @@
14 qml-module-qtsysteminfo,
15 qtdeclarative5-ubuntu-content1,
16 qtdeclarative5-ubuntu-settings-components (>= 0.8),
17- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
18+ qml-module-ubuntu-components (>= 1.3.1584) | qml-module-ubuntu-components-gles (>= 1.3.1584),
19 suru-icon-theme (>= 14.04+15.04.20150813~),
20 whoopsie-preferences (>= 0.9),
21 libsystemsettings1 (= ${binary:Version}),

Subscribers

People subscribed via source and target branches