Unity 8

Merge lp:~aacid/unity8/correct_web_dep into lp:unity8

correct_web_dep
Merge into trunk

Proposed by Albert Astals Cid on 2016-05-11

Status:	Superseded
Proposed branch:	lp:~aacid/unity8/correct_web_dep
Merge into:	lp:unity8
Diff against target:	186 lines (+35/-19) 6 files modified debian/control (+8/-8) qml/Wizard/Pages/50-timezone.qml (+5/-2) tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt (+1/-1) tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml (+16/-4) tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir (+1/-1) tests/qmltests/Wizard/tst_Wizard.qml (+4/-3)
To merge this branch:	bzr merge lp:~aacid/unity8/correct_web_dep
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Terry			Needs Fixing on 2016-05-17
Unity8 CI Bot	continuous-integration		Approve on 2016-05-13
Timo Jyrinki		2016-05-11	Approve on 2016-05-11
Review via email: mp+294328@code.launchpad.net

This proposal has been superseded by a proposal from 2016-05-18.

Commit Message

Use non deprecated package names

qtdeclarative5-ubuntu-web-plugin -> qml-module-ubuntu-web
qtdeclarative5-qtmultimedia-plugin -> qml-module-qtmultimedia
qtdeclarative5-ubuntu-ui-toolkit-plugin -> qml-module-ubuntu-components
qtdeclarative5-ubuntu-thumbnailer0.1 -> qml-module-ubuntu-thumbnailer0.1

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No, will do if asked

* If you changed the UI, has there been a design review?
N/A

Timo Jyrinki (timo-jyrinki) wrote on 2016-05-11:

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

PASSED: Continuous integration, rev:2395
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1178/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/721
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/721
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1578
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1535
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1535
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1535/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1535/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1535/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1535/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1535/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1535
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1535/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp:~aacid/unity8/correct_web_dep updated on 2016-05-11

2396. By Albert Astals Cid on 2016-05-11: more deprecated names replacements

Timo Jyrinki (timo-jyrinki) wrote on 2016-05-11:

Still great!

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-13:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-13:

PASSED: Continuous integration, rev:2396
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1213/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1628
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1582
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1582
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1575
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1575/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Michael Terry (mterry) wrote on 2016-05-17:

We try to keep those lists sorted, would be nice if they could remain so.

Michael Terry (mterry) on 2016-05-17:

review: Needs Fixing

lp:~aacid/unity8/correct_web_dep updated on 2016-05-18

2397. By Albert Astals Cid on 2016-05-18: sort me

Albert Astals Cid (aacid) wrote on 2016-05-18:

> We try to keep those lists sorted, would be nice if they could remain so.
Done

lp:~aacid/unity8/correct_web_dep updated on 2016-06-06

2398. By Albert Astals Cid on 2016-05-18: Merge lp:~mterry/unity8/timezone-name
2399. By Albert Astals Cid on 2016-06-02: Merge
2400. By Albert Astals Cid on 2016-06-06: Fix build.sh too

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'debian/control'
2	--- debian/control 2016-05-04 18:09:25 +0000
3	+++ debian/control 2016-05-18 12:27:08 +0000
4	@@ -41,11 +41,14 @@
5	python3-all:any,
6	python3-setuptools,
7	qml-module-qt-labs-folderlistmodel,
8	+ qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
9	qml-module-qtquick-layouts,
10	qml-module-qtquick-xmllistmodel,
11	qml-module-qtquick2,
12	qml-module-qtsysteminfo,
13	qml-module-qttest,
14	+ qml-module-ubuntu-components (>= 1.3.1845) \| qml-module-ubuntu-components-gles (>= 1.3.1845),
15	+ qml-module-ubuntu-web,
16	qt5-default,
17	qtbase5-dev (>= 5.4),
18	qtbase5-dev-tools,
19	@@ -53,11 +56,8 @@
20	qtdeclarative5-dev (>= 5.4),
21	qtdeclarative5-dev-tools,
22	qtdeclarative5-private-dev (>= 5.4),
23	- qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
24	qtdeclarative5-ubuntu-content1,
25	qtdeclarative5-ubuntu-settings-components (>= 0.7),
26	- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) \| qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
27	- qtdeclarative5-ubuntu-web-plugin,
28	ttf-ubuntu-font-family,
29	Standards-Version: 3.9.4
30	Homepage: http://launchpad.net/unity
31	@@ -72,7 +72,7 @@
32	Package: indicators-client
33	Architecture: amd64 armhf i386
34	Depends: qmenumodel-qml (>= 0.2.9),
35	- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) \| qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
36	+ qml-module-ubuntu-components (>= 1.3.1845) \| qml-module-ubuntu-components-gles (>= 1.3.1845),
37	unity8 (= ${binary:Version}),
38	${misc:Depends},
39	${shlibs:Depends},
40	@@ -103,10 +103,10 @@
41	qml-module-qt-labs-folderlistmodel,
42	qml-module-qtquick-xmllistmodel,
43	qml-module-qtsysteminfo,
44	+ qml-module-ubuntu-web,
45	qtdeclarative5-qtmir-plugin (>= 0.4.8),
46	qtdeclarative5-ubuntu-telephony0.1,
47	- qtdeclarative5-ubuntu-web-plugin,
48	- ubuntu-system-settings,
49	+ ubuntu-system-settings (>= 0.4),
50	unity-launcher-impl-7,
51	unity8-common (= ${source:Version}),
52	unity8-private (= ${binary:Version}),
53	@@ -128,9 +128,9 @@
54	Package: unity8-common
55	Architecture: all
56	Depends: qml-module-qtquick-layouts,
57	+ qml-module-ubuntu-components (>= 1.3.1845) \| qml-module-ubuntu-components-gles (>= 1.3.1845),
58	+ qml-module-ubuntu-thumbnailer0.1 \| ubuntu-thumbnailer-impl,
59	qtdeclarative5-ubuntu-settings-components (>= 0.7),
60	- qtdeclarative5-ubuntu-thumbnailer0.1 \| ubuntu-thumbnailer-impl,
61	- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) \| qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
62	qtdeclarative5-unity-notifications-plugin (>= 0.1.2) \| unity-notifications-impl,
63	ubuntu-thumbnailer-impl-0,
64	unity-application-impl-15,
65
66	=== modified file 'qml/Wizard/Pages/50-timezone.qml'
67	--- qml/Wizard/Pages/50-timezone.qml 2016-03-16 11:38:39 +0000
68	+++ qml/Wizard/Pages/50-timezone.qml 2016-05-18 12:27:08 +0000
69	@@ -18,7 +18,7 @@
70	import QtQuick.Layouts 1.1
71	import Ubuntu.Components 1.3
72	import Wizard 0.1
73	-import Ubuntu.SystemSettings.TimeDate 1.0
74	+import Ubuntu.SystemSettings.TimeDate 1.1
75	import Utils 0.1 as Utils
76	import ".." as LocalComponents
77
78	@@ -30,6 +30,7 @@
79	forwardButtonSourceComponent: forwardButton
80
81	property string selectedTimeZone: ""
82	+ property string selectedTimeZoneName: ""
83	readonly property bool showingMap: wideMode && width >= units.gu(110)
84
85	// for testing
86	@@ -67,6 +68,7 @@
87
88	function resetViews() {
89	selectedTimeZone = ""
90	+ selectedTimeZoneName = ""
91	tzList.currentIndex = -1
92	highlightImage.source = ""
93	pinImage.x = 0;
94	@@ -144,6 +146,7 @@
95	highlightTimezone(offset);
96	ListView.view.currentIndex = index;
97	selectedTimeZone = timeZone;
98	+ selectedTimeZoneName = city;
99	//print("Clicked at city with coords:", longitude, latitude);
100	//print("Clicked on TZ:", timeZone);
101	//print("Highlight at (x,y):", longitudeToX(longitude, map.width), latitudeToY(latitude, map.height));
102	@@ -267,7 +270,7 @@
103	text: i18n.tr("Next")
104	enabled: selectedTimeZone != ""
105	onClicked: {
106	- timeDatePanel.timeZone = selectedTimeZone;
107	+ timeDatePanel.setTimeZone(selectedTimeZone, selectedTimeZoneName);
108	pageStack.next();
109	}
110	}
111
112	=== modified file 'tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt'
113	--- tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt 2015-12-04 14:13:49 +0000
114	+++ tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt 2016-05-18 12:27:08 +0000
115	@@ -1,1 +1,1 @@
116	-add_unity8_mock(Ubuntu.SystemSettings.TimeDate 1.0 Ubuntu/SystemSettings/TimeDate)
117	+add_unity8_mock(Ubuntu.SystemSettings.TimeDate 1.1 Ubuntu/SystemSettings/TimeDate)
118
119	=== modified file 'tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml'
120	--- tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml 2015-12-06 14:58:57 +0000
121	+++ tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml 2016-05-18 12:27:08 +0000
122	@@ -18,8 +18,20 @@
123
124	Item {
125	id: root
126	- property string timeZone: "Europe/Prague"
127	- onTimeZoneChanged: root.timeZoneChangedCalled(root.timeZone);
128	-
129	- signal timeZoneChangedCalled(string tz);
130	+ readonly property alias timeZone: d.timeZone
131	+ readonly property alias timeZoneName: d.timeZoneName
132	+
133	+ signal timeZoneChangedCalled(string tz, string name) // only in mock
134	+
135	+ function setTimeZone(tz, name) {
136	+ d.timeZone = tz;
137	+ d.timeZoneName = name;
138	+ timeZoneChangedCalled(tz, name);
139	+ }
140	+
141	+ QtObject {
142	+ id: d
143	+ property string timeZone: "Europe/Prague"
144	+ property string timeZoneName: "Prague"
145	+ }
146	}
147
148	=== modified file 'tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir'
149	--- tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir 2015-12-04 14:13:49 +0000
150	+++ tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir 2016-05-18 12:27:08 +0000
151	@@ -1,2 +1,2 @@
152	module Ubuntu.SystemSettings.TimeDate
153	-UbuntuTimeDatePanel 1.0 MockTimeDate.qml
154	+UbuntuTimeDatePanel 1.1 MockTimeDate.qml
155
156	=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
157	--- tests/qmltests/Wizard/tst_Wizard.qml 2016-04-27 15:01:10 +0000
158	+++ tests/qmltests/Wizard/tst_Wizard.qml 2016-05-18 12:27:08 +0000
159	@@ -21,7 +21,7 @@
160	import QMenuModel 0.1
161	import Ubuntu.Components 1.3
162	import Ubuntu.SystemSettings.SecurityPrivacy 1.0
163	-import Ubuntu.SystemSettings.TimeDate 1.0
164	+import Ubuntu.SystemSettings.TimeDate 1.1
165	import Unity.Test 0.1 as UT
166	import Wizard 0.1
167	import "../../../qml/Wizard"
168	@@ -464,7 +464,7 @@
169	var tzFilter = findChild(page, "tzFilter");
170	verify(tzFilter);
171	tap(tzFilter);
172	- typeString("London");
173	+ typeString("Belfa");
174
175	var tzList = findChild(page, "tzList");
176	verify(tzList);
177	@@ -478,7 +478,8 @@
178	// go next and verify the (mock) signal got fired
179	tap(findChild(page, "forwardButton"));
180	tryCompare(timezoneSpy, "count", 1);
181	- tryCompare(page.tdModule, "timeZone", timezoneSpy.signalArguments[0][0]);
182	+ compare(timezoneSpy.signalArguments[0][0], "Europe/London");
183	+ compare(timezoneSpy.signalArguments[0][1], "Belfast");
184	}
185
186	function test_accountPage() {