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

Proposed by Michał Sawicz on 2017-03-28
Status: Approved
Approved by: Gerry Boland on 2017-04-04
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 2017-03-28 Approve on 2017-04-04
Unity8 CI Bot continuous-integration Approve on 2017-03-29
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.
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)
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)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
lp:~saviq/unity8/common-nodep-tests updated on 2017-04-07
2894. By Michał Sawicz on 2017-04-07

Merge trunk

Unmerged revisions

2894. By Michał Sawicz on 2017-04-07

Merge trunk

2893. By Michał Sawicz on 2017-03-28

wrap-and-sort -at

2892. By Michał Sawicz on 2017-03-28

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
1=== modified file 'debian/control'
2--- debian/control 2017-03-20 10:19:11 +0000
3+++ debian/control 2017-04-07 07:44:42 +0000
4@@ -18,11 +18,11 @@
5 libconnectivity-qt1-dev (>= 0.7.1),
6 libevdev-dev,
7 libgeonames-dev (>= 0.2),
8- libgnome-desktop-3-dev,
9 libgl1-mesa-dev[!arm64 !armhf] | libgl-dev[!arm64 !armhf],
10 libgl1-mesa-dri,
11 libgles2-mesa-dev[arm64 armhf],
12 libglib2.0-dev,
13+ libgnome-desktop-3-dev,
14 libgsettings-qt-dev,
15 libhardware-dev,
16 liblightdm-qt5-3-dev,
17@@ -53,8 +53,8 @@
18 qtdbustest-runner,
19 qml-module-qt-labs-folderlistmodel,
20 qml-module-qt-labs-settings,
21+ qml-module-qtmultimedia (>= 5.6),
22 qml-module-qtqml-statemachine,
23- qml-module-qtmultimedia (>= 5.6),
24 qml-module-qtquick-layouts,
25 qml-module-qtquick-xmllistmodel,
26 qml-module-qtquick2,
27@@ -95,24 +95,24 @@
28
29 Package: unity8-greeter
30 Architecture: any
31-Depends: unity8 (= ${binary:Version}),
32- unity-system-compositor,
33+Depends: unity-system-compositor,
34+ unity8 (= ${binary:Version}),
35 ${misc:Depends},
36- ${shlibs:Depends}
37-Recommends: lightdm
38-Provides: lightdm-greeter
39+ ${shlibs:Depends},
40+Recommends: lightdm,
41+Provides: lightdm-greeter,
42 Description: The Unity8 Greeter
43 The Unity 8 greeter is the primary login greeter for Ubuntu devices.
44
45 Package: unity-scope-tool
46 Architecture: any
47-Depends: unity8-common (= ${source:Version}),
48- unity8-private (= ${binary:Version}),
49- ${misc:Depends},
50- ${shlibs:Depends},
51+Depends: libunity-scopes-dev,
52 # We do call pkg-config libunity-scopes from the code
53 pkg-config,
54- libunity-scopes-dev,
55+ unity8-common (= ${source:Version}),
56+ unity8-private (= ${binary:Version}),
57+ ${misc:Depends},
58+ ${shlibs:Depends},
59 Description: Development tool for Unity scopes
60 This package contains the development tool for new generation Unity scopes, based
61 on Unity8.
62@@ -146,9 +146,9 @@
63 unity-greeter-session-broadcast,
64 Suggests: unity-scope-mediascanner2,
65 Breaks: indicator-network (<< 0.5.1+14.10.20141014),
66+ ubuntu-keyboard (<< 0.100),
67 ubuntu-touch-session (<< 0.107),
68 unity8-greeter (<< 7.89),
69- ubuntu-keyboard (<< 0.100),
70 Replaces: ubuntu-touch-session (<< 0.82~),
71 unity8-greeter (<< 7.89),
72 Conflicts: ubuntu-system-settings-wizard,
73@@ -160,6 +160,7 @@
74 Depends: qml-module-qtquick-layouts,
75 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
76 qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
77+ qtdeclarative5-qtmir-plugin | unity-application-impl,
78 qtdeclarative5-ubuntu-settings-components (>= 0.11),
79 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
80 qttranslations5-l10n,
81@@ -169,7 +170,6 @@
82 unity-notifications-impl-3,
83 unity-plugin-scopes | unity-scopes-impl,
84 unity-scopes-impl-12,
85- unity8-tests | unity-application-impl,
86 ${misc:Depends},
87 Breaks: unity8 (<< 7.86),
88 Replaces: unity8 (<< 7.86),
89@@ -233,9 +233,9 @@
90 Depends: accountsservice-ubuntu-schemas (>= 0.0.7),
91 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
92 libhardware2,
93+ qml-module-qtmultimedia,
94+ qtdeclarative5-gsettings1.0,
95 unity-schemas (>= 7.3.1+14.10.20140915),
96- qtdeclarative5-gsettings1.0,
97- qml-module-qtmultimedia,
98 ${misc:Depends},
99 ${shlibs:Depends},
100 Provides: unity-launcher-impl,
101
102=== modified file 'debian/unity8-greeter.install'
103--- debian/unity8-greeter.install 2016-06-08 21:52:16 +0000
104+++ debian/unity8-greeter.install 2017-04-07 07:44:42 +0000
105@@ -1,5 +1,5 @@
106+data/unity8-greeter-init.conf usr/share/upstart/sessions/
107 data/unity8-greeter-wrapper usr/bin/
108-data/unity8-greeter-init.conf usr/share/upstart/sessions/
109 data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
110 usr/share/lightdm/greeters/unity8-greeter.desktop
111 usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf
112
113=== modified file 'debian/unity8-private.install'
114--- debian/unity8-private.install 2016-08-30 14:06:47 +0000
115+++ debian/unity8-private.install 2017-04-07 07:44:42 +0000
116@@ -10,9 +10,9 @@
117 usr/lib/*/unity8/qml/Powerd
118 usr/lib/*/unity8/qml/ScreenshotDirectory
119 usr/lib/*/unity8/qml/SessionBroadcast
120+usr/lib/*/unity8/qml/UInput
121 usr/lib/*/unity8/qml/Ubuntu
122 usr/lib/*/unity8/qml/Unity
123-usr/lib/*/unity8/qml/UInput
124 usr/lib/*/unity8/qml/Utils
125 usr/lib/*/unity8/qml/WindowManager
126 usr/lib/*/unity8/qml/Wizard
127
128=== modified file 'debian/unity8.install'
129--- debian/unity8.install 2017-04-04 19:07:49 +0000
130+++ debian/unity8.install 2017-04-07 07:44:42 +0000
131@@ -1,22 +1,22 @@
132-debian/usr.bin.unity8-dash etc/apparmor.d
133-var/lib/unity8/version
134+data/devices.conf etc/ubuntu/
135 data/unity8-filewatcher.conf usr/share/upstart/sessions/
136 data/unity8.conf usr/share/upstart/sessions/
137-data/devices.conf etc/ubuntu/
138+debian/usr.bin.unity8-dash etc/apparmor.d
139 usr/bin/unity8
140 usr/bin/unity8-dash
141 usr/share/applications/unity8-dash.desktop
142 usr/share/applications/unity8.desktop
143 usr/share/unity8/ApplicationMenus
144+usr/share/unity8/DeviceConfiguration.qml
145+usr/share/unity8/DisabledScreenNotice.qml
146 usr/share/unity8/Greeter
147 usr/share/unity8/Launcher
148+usr/share/unity8/OrientedShell.qml
149 usr/share/unity8/Panel
150 usr/share/unity8/Rotation
151-usr/share/unity8/DeviceConfiguration.qml
152-usr/share/unity8/OrientedShell.qml
153-usr/share/unity8/DisabledScreenNotice.qml
154 usr/share/unity8/Shell.qml
155 usr/share/unity8/Stage
156 usr/share/unity8/Tutorial
157 usr/share/unity8/Wizard
158 usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
159+var/lib/unity8/version

Subscribers

People subscribed via source and target branches