Unity 8

Merge lp:~saviq/unity8/common-nodep-tests into lp:unity8

  1. common-nodep-tests
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Approved
Approved by: Gerry Boland
Approved revision: 2893
Proposed branch: lp:~saviq/unity8/common-nodep-tests
Merge into: lp:unity8
Diff against target: 159 lines (+24/-24)
4 files modified
debian/control (+16/-16)
debian/unity8-greeter.install (+1/-1)
debian/unity8-private.install (+1/-1)
debian/unity8.install (+6/-6)
To merge this branch: bzr merge lp:~saviq/unity8/common-nodep-tests
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+321226@code.launchpad.net

Commit message

Default to qtmir for providing the Unity.Application module

Also do wrap-and-sort -at for good measure

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3590/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4756
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4784
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4607
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4607/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3591/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4757
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4785
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4608/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4608/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4608/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4608/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4608/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4608
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4608/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
Reply
lp:~saviq/unity8/common-nodep-tests updated
2894. By Michał Sawicz

Merge trunk

Unmerged revisions

2894. By Michał Sawicz

Merge trunk

2893. By Michał Sawicz

wrap-and-sort -at

2892. By Michał Sawicz

Default to qtmir for providing the Unity.Application module

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-03-20 10:19:11 +0000
+++ debian/control 2017-04-07 07:44:42 +0000
@@ -18,11 +18,11 @@
18 libconnectivity-qt1-dev (>= 0.7.1),18 libconnectivity-qt1-dev (>= 0.7.1),
19 libevdev-dev,19 libevdev-dev,
20 libgeonames-dev (>= 0.2),20 libgeonames-dev (>= 0.2),
21 libgnome-desktop-3-dev,
22 libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],21 libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
23 libgl1-mesa-dri,22 libgl1-mesa-dri,
24 libgles2-mesa-dev[arm64 armhf],23 libgles2-mesa-dev[arm64 armhf],
25 libglib2.0-dev,24 libglib2.0-dev,
25 libgnome-desktop-3-dev,
26 libgsettings-qt-dev,26 libgsettings-qt-dev,
27 libhardware-dev,27 libhardware-dev,
28 liblightdm-qt5-3-dev,28 liblightdm-qt5-3-dev,
@@ -53,8 +53,8 @@
53 qtdbustest-runner,53 qtdbustest-runner,
54 qml-module-qt-labs-folderlistmodel,54 qml-module-qt-labs-folderlistmodel,
55 qml-module-qt-labs-settings,55 qml-module-qt-labs-settings,
56 qml-module-qtmultimedia (>= 5.6),
56 qml-module-qtqml-statemachine,57 qml-module-qtqml-statemachine,
57 qml-module-qtmultimedia (>= 5.6),
58 qml-module-qtquick-layouts,58 qml-module-qtquick-layouts,
59 qml-module-qtquick-xmllistmodel,59 qml-module-qtquick-xmllistmodel,
60 qml-module-qtquick2,60 qml-module-qtquick2,
@@ -95,24 +95,24 @@
9595
96Package: unity8-greeter96Package: unity8-greeter
97Architecture: any97Architecture: any
98Depends: unity8 (= ${binary:Version}),98Depends: unity-system-compositor,
99 unity-system-compositor,99 unity8 (= ${binary:Version}),
100 ${misc:Depends},100 ${misc:Depends},
101 ${shlibs:Depends}101 ${shlibs:Depends},
102Recommends: lightdm102Recommends: lightdm,
103Provides: lightdm-greeter103Provides: lightdm-greeter,
104Description: The Unity8 Greeter104Description: The Unity8 Greeter
105 The Unity 8 greeter is the primary login greeter for Ubuntu devices.105 The Unity 8 greeter is the primary login greeter for Ubuntu devices.
106106
107Package: unity-scope-tool107Package: unity-scope-tool
108Architecture: any108Architecture: any
109Depends: unity8-common (= ${source:Version}),109Depends: libunity-scopes-dev,
110 unity8-private (= ${binary:Version}),
111 ${misc:Depends},
112 ${shlibs:Depends},
113# We do call pkg-config libunity-scopes from the code110# We do call pkg-config libunity-scopes from the code
114 pkg-config,111 pkg-config,
115 libunity-scopes-dev,112 unity8-common (= ${source:Version}),
113 unity8-private (= ${binary:Version}),
114 ${misc:Depends},
115 ${shlibs:Depends},
116Description: Development tool for Unity scopes116Description: Development tool for Unity scopes
117 This package contains the development tool for new generation Unity scopes, based117 This package contains the development tool for new generation Unity scopes, based
118 on Unity8.118 on Unity8.
@@ -146,9 +146,9 @@
146 unity-greeter-session-broadcast,146 unity-greeter-session-broadcast,
147Suggests: unity-scope-mediascanner2,147Suggests: unity-scope-mediascanner2,
148Breaks: indicator-network (<< 0.5.1+14.10.20141014),148Breaks: indicator-network (<< 0.5.1+14.10.20141014),
149 ubuntu-keyboard (<< 0.100),
149 ubuntu-touch-session (<< 0.107),150 ubuntu-touch-session (<< 0.107),
150 unity8-greeter (<< 7.89),151 unity8-greeter (<< 7.89),
151 ubuntu-keyboard (<< 0.100),
152Replaces: ubuntu-touch-session (<< 0.82~),152Replaces: ubuntu-touch-session (<< 0.82~),
153 unity8-greeter (<< 7.89),153 unity8-greeter (<< 7.89),
154Conflicts: ubuntu-system-settings-wizard,154Conflicts: ubuntu-system-settings-wizard,
@@ -160,6 +160,7 @@
160Depends: qml-module-qtquick-layouts,160Depends: qml-module-qtquick-layouts,
161 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),161 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
162 qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,162 qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
163 qtdeclarative5-qtmir-plugin | unity-application-impl,
163 qtdeclarative5-ubuntu-settings-components (>= 0.11),164 qtdeclarative5-ubuntu-settings-components (>= 0.11),
164 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,165 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
165 qttranslations5-l10n,166 qttranslations5-l10n,
@@ -169,7 +170,6 @@
169 unity-notifications-impl-3,170 unity-notifications-impl-3,
170 unity-plugin-scopes | unity-scopes-impl,171 unity-plugin-scopes | unity-scopes-impl,
171 unity-scopes-impl-12,172 unity-scopes-impl-12,
172 unity8-tests | unity-application-impl,
173 ${misc:Depends},173 ${misc:Depends},
174Breaks: unity8 (<< 7.86),174Breaks: unity8 (<< 7.86),
175Replaces: unity8 (<< 7.86),175Replaces: unity8 (<< 7.86),
@@ -233,9 +233,9 @@
233Depends: accountsservice-ubuntu-schemas (>= 0.0.7),233Depends: accountsservice-ubuntu-schemas (>= 0.0.7),
234 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),234 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
235 libhardware2,235 libhardware2,
236 qml-module-qtmultimedia,
237 qtdeclarative5-gsettings1.0,
236 unity-schemas (>= 7.3.1+14.10.20140915),238 unity-schemas (>= 7.3.1+14.10.20140915),
237 qtdeclarative5-gsettings1.0,
238 qml-module-qtmultimedia,
239 ${misc:Depends},239 ${misc:Depends},
240 ${shlibs:Depends},240 ${shlibs:Depends},
241Provides: unity-launcher-impl,241Provides: unity-launcher-impl,
242242
=== modified file 'debian/unity8-greeter.install'
--- debian/unity8-greeter.install 2016-06-08 21:52:16 +0000
+++ debian/unity8-greeter.install 2017-04-07 07:44:42 +0000
@@ -1,5 +1,5 @@
1data/unity8-greeter-init.conf usr/share/upstart/sessions/
1data/unity8-greeter-wrapper usr/bin/2data/unity8-greeter-wrapper usr/bin/
2data/unity8-greeter-init.conf usr/share/upstart/sessions/
3data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/3data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
4usr/share/lightdm/greeters/unity8-greeter.desktop4usr/share/lightdm/greeters/unity8-greeter.desktop
5usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf5usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf
66
=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install 2016-08-30 14:06:47 +0000
+++ debian/unity8-private.install 2017-04-07 07:44:42 +0000
@@ -10,9 +10,9 @@
10usr/lib/*/unity8/qml/Powerd10usr/lib/*/unity8/qml/Powerd
11usr/lib/*/unity8/qml/ScreenshotDirectory11usr/lib/*/unity8/qml/ScreenshotDirectory
12usr/lib/*/unity8/qml/SessionBroadcast12usr/lib/*/unity8/qml/SessionBroadcast
13usr/lib/*/unity8/qml/UInput
13usr/lib/*/unity8/qml/Ubuntu14usr/lib/*/unity8/qml/Ubuntu
14usr/lib/*/unity8/qml/Unity15usr/lib/*/unity8/qml/Unity
15usr/lib/*/unity8/qml/UInput
16usr/lib/*/unity8/qml/Utils16usr/lib/*/unity8/qml/Utils
17usr/lib/*/unity8/qml/WindowManager17usr/lib/*/unity8/qml/WindowManager
18usr/lib/*/unity8/qml/Wizard18usr/lib/*/unity8/qml/Wizard
1919
=== modified file 'debian/unity8.install'
--- debian/unity8.install 2017-04-04 19:07:49 +0000
+++ debian/unity8.install 2017-04-07 07:44:42 +0000
@@ -1,22 +1,22 @@
1debian/usr.bin.unity8-dash etc/apparmor.d1data/devices.conf etc/ubuntu/
2var/lib/unity8/version
3data/unity8-filewatcher.conf usr/share/upstart/sessions/2data/unity8-filewatcher.conf usr/share/upstart/sessions/
4data/unity8.conf usr/share/upstart/sessions/3data/unity8.conf usr/share/upstart/sessions/
5data/devices.conf etc/ubuntu/4debian/usr.bin.unity8-dash etc/apparmor.d
6usr/bin/unity85usr/bin/unity8
7usr/bin/unity8-dash6usr/bin/unity8-dash
8usr/share/applications/unity8-dash.desktop7usr/share/applications/unity8-dash.desktop
9usr/share/applications/unity8.desktop8usr/share/applications/unity8.desktop
10usr/share/unity8/ApplicationMenus9usr/share/unity8/ApplicationMenus
10usr/share/unity8/DeviceConfiguration.qml
11usr/share/unity8/DisabledScreenNotice.qml
11usr/share/unity8/Greeter12usr/share/unity8/Greeter
12usr/share/unity8/Launcher13usr/share/unity8/Launcher
14usr/share/unity8/OrientedShell.qml
13usr/share/unity8/Panel15usr/share/unity8/Panel
14usr/share/unity8/Rotation16usr/share/unity8/Rotation
15usr/share/unity8/DeviceConfiguration.qml
16usr/share/unity8/OrientedShell.qml
17usr/share/unity8/DisabledScreenNotice.qml
18usr/share/unity8/Shell.qml17usr/share/unity8/Shell.qml
19usr/share/unity8/Stage18usr/share/unity8/Stage
20usr/share/unity8/Tutorial19usr/share/unity8/Tutorial
21usr/share/unity8/Wizard20usr/share/unity8/Wizard
22usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher21usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
22var/lib/unity8/version

Subscribers

People subscribed via source and target branches