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

Subscribers

People subscribed via source and target branches