Merge lp:~pitti/ubuntu-ui-toolkit/qt-deps into lp:ubuntu-ui-toolkit/staging

Proposed by Martin Pitt
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1068
Merged at revision: 1201
Proposed branch: lp:~pitti/ubuntu-ui-toolkit/qt-deps
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 415 lines (+392/-1)
2 files modified
debian/control (+2/-1)
po/it.po (+390/-0)
To merge this branch: bzr merge lp:~pitti/ubuntu-ui-toolkit/qt-deps
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Nicholas Skaggs Pending
Leo Arias Pending
Review via email: mp+229896@code.launchpad.net

This proposal supersedes a proposal from 2014-08-06.

Description of the change

autopilot-qt was recently split into Qt4 and Qt5 packages:
https://launchpad.net/ubuntu/+source/autopilot-qt/1.4+14.10.20140724.1-0ubuntu2

Now libautopilot-qt pulls in a lot of qt4 packages. Avoid that by depending on
the Qt5 specific packages only.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote : Posted in a previous version of this proposal

Thanks Martin.

review: Approve
Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

Yep yep, ty ty!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
Martin Pitt (pitti) wrote :

Re-submitted to staging. Ubuntu SDK developers: Can you pretty please set lp:ubuntu-sdk-pilot to the staging branch, if that's what your trunk actually is? Thanks!

Revision history for this message
Martin Pitt (pitti) wrote :

Note: That extra translation commit is from the automatic LP update (http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/revision/1067) because trunk got ahead of staging. That's another consequence of mis-configuring trunk. But that should be harmless to just include in that MP.

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

I have created a staging series set up for the lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging and changed the project development focus to this series.

The confusion come from the idea of "holly trunk". According to the CI policy, no development branch can land on the trunk without going thru the CI process. That process takes 6-12 hours in a super optimal case. In a typical case it is 18-36 hours. So we stopped using the trunk and made the staging branch to land our MRs faster. Even that can take 2-24 hours or more.

So in fact the staging is the trunk and the trunk is used only for releasing the UITK.

Sorry for the confusion.

Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks Zoltan! Right, to keep the terms straight, the branch called "/trunk" can continue to be what's in the archive (even if that's not a real trunk, but I know that this isn't your decision). What I actually meant was that the "development focus" was wrong, i. e. what lp:<project> pointed to. Thanks for fixing this!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/738/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/570
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4395
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2749
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2749/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/738/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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 2014-07-30 11:45:39 +0000
3+++ debian/control 2014-08-07 05:22:17 +0000
4@@ -131,7 +131,7 @@
5 Architecture: any
6 Depends: ${misc:Depends},
7 ${shlibs:Depends},
8- libautopilot-qt,
9+ autopilot-qt5,
10 dpkg-dev,
11 libqt5test5,
12 libqt5widgets5,
13@@ -146,6 +146,7 @@
14 python3-testscenarios,
15 python3-testtools,
16 python3-autopilot (>= 1.4),
17+ qttestability-autopilot,
18 ubuntu-ui-toolkit-examples (>= ${source:Version}),
19 Description: Test package for Ubuntu UI Toolkit
20 Autopilot tests for the ubuntu-ui-toolkit package
21
22=== added file 'po/it.po'
23--- po/it.po 1970-01-01 00:00:00 +0000
24+++ po/it.po 2014-08-07 05:22:17 +0000
25@@ -0,0 +1,390 @@
26+# Italian translation for ubuntu-ui-toolkit
27+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
28+# This file is distributed under the same license as the ubuntu-ui-toolkit package.
29+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
30+#
31+msgid ""
32+msgstr ""
33+"Project-Id-Version: ubuntu-ui-toolkit\n"
34+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
35+"POT-Creation-Date: 2013-05-30 14:06+0200\n"
36+"PO-Revision-Date: 2014-08-05 15:27+0000\n"
37+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38+"Language-Team: Italian <it@li.org>\n"
39+"MIME-Version: 1.0\n"
40+"Content-Type: text/plain; charset=UTF-8\n"
41+"Content-Transfer-Encoding: 8bit\n"
42+"X-Launchpad-Export-Date: 2014-08-06 06:51+0000\n"
43+"X-Generator: Launchpad (build 17147)\n"
44+
45+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
46+msgid "NumberAnimation"
47+msgstr ""
48+
49+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:26
50+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:25
51+#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:27
52+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:23
53+#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:26
54+#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:59
55+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:38
56+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:71
57+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:25
58+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:44
59+msgid "Standard"
60+msgstr ""
61+
62+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:56
63+msgid "Standard Durations"
64+msgstr ""
65+
66+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:60
67+msgid "Snap"
68+msgstr ""
69+
70+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:96
71+msgid "Fast"
72+msgstr ""
73+
74+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:132
75+msgid "Slow"
76+msgstr ""
77+
78+#: examples/ubuntu-ui-toolkit-gallery/Animations.qml:157
79+msgid "Sleepy"
80+msgstr ""
81+
82+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:28
83+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:36
84+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:50
85+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:59
86+msgid "Call"
87+msgstr ""
88+
89+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:33
90+#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:26
91+msgid "Color"
92+msgstr ""
93+
94+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:42
95+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:41
96+msgid "Icon"
97+msgstr ""
98+
99+#: examples/ubuntu-ui-toolkit-gallery/Buttons.qml:56
100+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:73
101+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:41
102+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:75
103+msgid "Disabled"
104+msgstr ""
105+
106+#: examples/ubuntu-ui-toolkit-gallery/Dialog.qml:30
107+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:42
108+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:41
109+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:74
110+msgid "Open"
111+msgstr ""
112+
113+#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:25
114+msgid "Scaling"
115+msgstr ""
116+
117+#: examples/ubuntu-ui-toolkit-gallery/Icons.qml:50
118+msgid "Colorization"
119+msgstr ""
120+
121+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:26
122+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:34
123+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:44
124+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:53
125+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:62
126+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:71
127+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:83
128+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:95
129+msgid "Label"
130+msgstr ""
131+
132+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:31
133+msgid "Subtitled"
134+msgstr ""
135+
136+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:35
137+msgid "Secondary label"
138+msgstr ""
139+
140+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:50
141+msgid "Progression"
142+msgstr ""
143+
144+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:59
145+msgid "Single value"
146+msgstr ""
147+
148+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:63
149+msgid "Value"
150+msgstr ""
151+
152+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:68
153+msgid "Multi value"
154+msgstr ""
155+
156+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:72
157+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:84
158+msgid "Value 1"
159+msgstr ""
160+
161+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:73
162+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:85
163+msgid "Value 2"
164+msgstr ""
165+
166+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:74
167+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:86
168+msgid "Value 3"
169+msgstr ""
170+
171+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:75
172+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:87
173+msgid "Value 4"
174+msgstr ""
175+
176+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:80
177+msgid "Value selector"
178+msgstr ""
179+
180+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:92
181+msgid "Control"
182+msgstr ""
183+
184+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:103
185+msgid "Removable"
186+msgstr ""
187+
188+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:106
189+msgid "Slide to remove"
190+msgstr ""
191+
192+#: examples/ubuntu-ui-toolkit-gallery/ListItems.qml:116
193+msgid "Grouped list"
194+msgstr ""
195+
196+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:38
197+msgid "Flickable"
198+msgstr ""
199+
200+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:74
201+msgid "Action #1"
202+msgstr ""
203+
204+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:78
205+msgid "Action #2"
206+msgstr ""
207+
208+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:82
209+msgid "Action #3"
210+msgstr ""
211+
212+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:86
213+msgid "Action #4"
214+msgstr ""
215+
216+#: examples/ubuntu-ui-toolkit-gallery/Popover.qml:90
217+msgid "Action #5"
218+msgstr ""
219+
220+#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:22
221+msgid "Progress Bar"
222+msgstr ""
223+
224+#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:45
225+msgid "Infinite"
226+msgstr ""
227+
228+#: examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml:55
229+msgid "Activity Indicator"
230+msgstr ""
231+
232+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:26
233+msgid "The visual style of the Sheet is early work and thus clunky looking."
234+msgstr ""
235+
236+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:51
237+#: examples/ubuntu-ui-toolkit-gallery/Sheet.qml:84
238+msgid "Title"
239+msgstr ""
240+
241+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:32
242+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:45
243+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:60
244+#, qt-format
245+msgid "value = %1"
246+msgstr ""
247+
248+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:37
249+msgid "Live Update"
250+msgstr ""
251+
252+#: examples/ubuntu-ui-toolkit-gallery/Sliders.qml:50
253+msgid "Range"
254+msgstr ""
255+
256+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:47
257+msgid "Type me in..."
258+msgstr ""
259+
260+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:53
261+msgid "Password"
262+msgstr ""
263+
264+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:63
265+msgid "Numbers"
266+msgstr ""
267+
268+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:87
269+msgid "Default"
270+msgstr ""
271+
272+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:96
273+msgid "Expanding"
274+msgstr ""
275+
276+#: examples/ubuntu-ui-toolkit-gallery/TextInputs.qml:107
277+msgid "Rich Text"
278+msgstr ""
279+
280+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:26
281+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:60
282+msgid "Unchecked"
283+msgstr ""
284+
285+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:33
286+#: examples/ubuntu-ui-toolkit-gallery/Toggles.qml:67
287+msgid "Checked"
288+msgstr ""
289+
290+#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:44
291+msgid "Image"
292+msgstr ""
293+
294+#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:57
295+msgid "Radius"
296+msgstr ""
297+
298+#: examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml:87
299+msgid "Sizes"
300+msgstr ""
301+
302+#: examples/unit-converter/unit-converter.qml:147
303+msgid "Clear"
304+msgstr ""
305+
306+#: examples/unit-converter/unit-converter.qml:161
307+msgid "Lengths"
308+msgstr ""
309+
310+#: examples/unit-converter/unit-converter.qml:179
311+msgid "Weights"
312+msgstr ""
313+
314+#: modules/Ubuntu/Components/plugin/ucarguments.cpp:188
315+msgid "Usage: "
316+msgstr ""
317+
318+#: modules/Ubuntu/Components/plugin/ucarguments.cpp:209
319+msgid "Options:"
320+msgstr ""
321+
322+#: modules/Ubuntu/Components/plugin/ucarguments.cpp:498
323+#, qt-format
324+msgid "%1 is expecting an additional argument: %2"
325+msgstr ""
326+
327+#: modules/Ubuntu/Components/plugin/ucarguments.cpp:503
328+#, qt-format
329+msgid "%1 is expecting a value for argument: %2"
330+msgstr ""
331+
332+#: modules/Ubuntu/Components/plugin/ucarguments.cpp:520
333+#, qt-format
334+msgid "%1 is expecting additional arguments: %2"
335+msgstr ""
336+
337+#: modules/Ubuntu/Components/TextInputPopover.qml:24
338+msgid "Select All"
339+msgstr ""
340+
341+#: modules/Ubuntu/Components/TextInputPopover.qml:29
342+msgid "Select Word"
343+msgstr ""
344+
345+#: modules/Ubuntu/Components/TextInputPopover.qml:34
346+msgid "Cut"
347+msgstr ""
348+
349+#: modules/Ubuntu/Components/TextInputPopover.qml:39
350+msgid "Copy"
351+msgstr ""
352+
353+#: modules/Ubuntu/Components/TextInputPopover.qml:44
354+msgid "Paste"
355+msgstr ""
356+
357+#: modules/Ubuntu/Components/TextInputPopover.qml:49
358+msgid "Undo"
359+msgstr ""
360+
361+#: modules/Ubuntu/Components/TextInputPopover.qml:54
362+msgid "Redo"
363+msgstr ""
364+
365+#: modules/Ubuntu/Components/ToolbarActions.qml:86
366+msgid "Back"
367+msgstr ""
368+
369+#: tests/resources/pagestack/MyCustomPage.qml:21
370+#: tests/resources/tabs/MyCustomPage.qml:21
371+msgid "My custom page"
372+msgstr ""
373+
374+#: tests/resources/pagestack/MyCustomPage.qml:33
375+#: tests/resources/tabs/MyCustomPage.qml:33
376+msgid ""
377+"This is an external page\n"
378+"with a locked toolbar."
379+msgstr ""
380+
381+#: tests/resources/pagestack/PageStack.qml:38
382+msgid "Root page"
383+msgstr ""
384+
385+#: tests/resources/pagestack/PageStack.qml:44
386+msgid "Page one"
387+msgstr ""
388+
389+#: tests/resources/pagestack/PageStack.qml:49
390+msgid "External page"
391+msgstr ""
392+
393+#: tests/resources/pagestack/PageStack.qml:58
394+msgid "First page"
395+msgstr ""
396+
397+#: tests/resources/pagestack/PageStack.qml:64
398+msgid "Root page (again)"
399+msgstr ""
400+
401+#: tests/resources/pagestack/PageStack.qml:69
402+msgid "Red rectangle"
403+msgstr ""
404+
405+#: tests/resources/tabs/Tabs.qml:32
406+msgid "Simple page"
407+msgstr ""
408+
409+#: tests/resources/tabs/Tabs.qml:77
410+msgid "External"
411+msgstr ""
412+
413+#: tests/resources/tabs/Tabs.qml:85
414+msgid "List view"
415+msgstr ""

Subscribers

People subscribed via source and target branches