ubuntu-system-settings

Merge lp:~robert-ancell/ubuntu-system-settings/new-qml-packages into lp:ubuntu-system-settings

  1. new-qml-packages
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Ken VanDine
Approved revision: 1487
Merged at revision: 1511
Proposed branch: lp:~robert-ancell/ubuntu-system-settings/new-qml-packages
Merge into: lp:ubuntu-system-settings
Diff against target: 27 lines (+3/-3)
1 file modified
debian/control (+3/-3)
To merge this branch: bzr merge lp:~robert-ancell/ubuntu-system-settings/new-qml-packages
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+266503@code.launchpad.net

Commit message

Use new QML package names for qml-module-qt-labs-folderlistmodel, qml-module-qtsysteminfo.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1487
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2233/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/417
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3526
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3526/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22235

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1487
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2234/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/418
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3532
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3532/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22246

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1487
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2241/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/425
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22259

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1487
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2242/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/426
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22267

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good, thanks

review: Approve
lp:~robert-ancell/ubuntu-system-settings/new-qml-packages updated
1488. By Robert Ancell

Merge with trunk

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 2015-08-17 21:56:30 +0000
3+++ debian/control 2015-08-24 07:50:29 +0000
4@@ -29,7 +29,7 @@
5 qtdeclarative5-dev,
6 libapt-pkg-dev,
7 # test-deps
8- qtdeclarative5-qtquick2-plugin,
9+ qml-module-qtquick2,
10 libubuntuoneauth-2.0-dev,
11 libubuntu-download-manager-client-dev,
12 libubuntu-download-manager-common-dev,
13@@ -70,12 +70,12 @@
14 indicator-power (>= 12.10.6+15.04.20150130),
15 powerd (>= 0.15) | gnome-settings-daemon,
16 qmenumodel-qml,
17- qtdeclarative5-folderlistmodel-plugin,
18+ qml-module-qt-labs-folderlistmodel,
19 qml-module-ubuntu-connectivity (>= 0.5.3),
20 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
21 qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
22 qtdeclarative5-ofono0.2 (>=0.70~),
23- qtdeclarative5-systeminfo-plugin,
24+ qml-module-qtsysteminfo,
25 qtdeclarative5-ubuntu-content1,
26 qtdeclarative5-ubuntu-settings-components (>> 0.6),
27 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),

Subscribers

People subscribed via source and target branches