Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/inline-gles-copy into lp:ubuntu-ui-toolkit
- inline-gles-copy
- Merge into trunk
Proposed by
Timo Jyrinki
Status: | Merged |
---|---|
Merged at revision: | 1295 |
Proposed branch: | lp:~timo-jyrinki/ubuntu-ui-toolkit/inline-gles-copy |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
598 lines (+488/-70) (has conflicts) 5 files modified
debian/bileto_convert_to_gles (+17/-0) debian/changelog (+100/-0) debian/control (+140/-70) debian/control.gles (+198/-0) debian/rules.gles (+33/-0) Text conflict in debian/changelog Text conflict in debian/control |
To merge this branch: | bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/inline-gles-copy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu SDK team | Pending | ||
Review via email: mp+291400@code.launchpad.net |
Commit message
Inline GLES packaging.
Description of the change
control.gles copied verbatim from lp:~ci-train-bot/ubuntu-ui-toolkit/ubuntu-ui-toolkit-gles-ubuntu-xenial-landing-050
continuation from https:/
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'debian/bileto_convert_to_gles' |
2 | --- debian/bileto_convert_to_gles 1970-01-01 00:00:00 +0000 |
3 | +++ debian/bileto_convert_to_gles 2016-04-08 18:13:18 +0000 |
4 | @@ -0,0 +1,17 @@ |
5 | +#!/bin/sh |
6 | + |
7 | +# This script converts the debian/ packaging into an alternate source package |
8 | +# which builds with GLES. You should copy the source tree into a new directory |
9 | +# before running this script (so you have one copy for GLES and one copy for |
10 | +# regular GL). |
11 | + |
12 | +set -eu |
13 | + |
14 | +mv --verbose debian/control.gles debian/control |
15 | +mv --verbose debian/rules.gles debian/rules |
16 | + |
17 | +sed --in-place 's/^ubuntu-ui-toolkit /ubuntu-ui-toolkit-gles /g' debian/changelog |
18 | + |
19 | +for gles in libubuntutoolkit5-gles-dev.install libubuntugestures5-gles-dev.install libubuntugestures5-gles.install libubuntutoolkit5-gles.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides; do |
20 | + mv --verbose debian/"$(echo $gles | sed 's/-gles//')" debian/$gles |
21 | +done |
22 | |
23 | === modified file 'debian/changelog' |
24 | --- debian/changelog 2016-04-08 15:23:50 +0000 |
25 | +++ debian/changelog 2016-04-08 18:13:18 +0000 |
26 | @@ -1,3 +1,4 @@ |
27 | +<<<<<<< TREE |
28 | ubuntu-ui-toolkit (1.3.1918+16.04.20160404-0ubuntu1) xenial; urgency=medium |
29 | |
30 | [ Benjamin Zeller ] |
31 | @@ -96,6 +97,105 @@ |
32 | |
33 | -- Zoltan Balogh <zoltan.balogh@canonical.com> Mon, 04 Apr 2016 04:47:18 +0000 |
34 | |
35 | +======= |
36 | +ubuntu-ui-toolkit (1.3.1918+16.04.20160404-0ubuntu1) xenial; urgency=medium |
37 | + |
38 | + [ Benjamin Zeller ] |
39 | + * Register expected warning messages in the tree testcase. |
40 | + * Add testsuite for Tree. Fixes LP: #1549171. |
41 | + * Compile with Qt 5.6. Fixes LP: #1540356 |
42 | + * More Qt 5.6 fixes. |
43 | + |
44 | + [ Michael Terry ] |
45 | + * Add grabGesture field to SwipeArea. |
46 | + * This field controls whether the SwipeArea takes ownership of the gestures it |
47 | + observes. Fixes LP: #1527387. |
48 | + |
49 | + [ Timo Jyrinki ] |
50 | + * Add a test for blocking if packaging not sorted and clean. |
51 | + * More package name transitioning, wrap and sort, fix debian/copyright syntax, |
52 | + update standards-version, fix devel package sections and add/fix |
53 | + lintian-overrides. |
54 | + |
55 | + [ Olivier Tilloy ] |
56 | + * Fix dependencies of the transitional dummy package |
57 | + qtdeclarative5-ubuntu-ui-toolkit-plugin. Fixes LP: #1553551. |
58 | + |
59 | + [ Christian Dywan ] |
60 | + * Rename qtdeclarative5-*-plugin to qml-module-*. Fixes LP: #1342031. |
61 | + * Require a qtdeclarative5 known to have the tab fence patch. |
62 | + * Reset previous theme version and use UbuntuTestCase in tst_animator. |
63 | + * BottomEdge(Hint) focus and close via keyboard. Fixes LP: #1523825 |
64 | + * Add 1.3 version of UbuntuTestCase. |
65 | + * No gdb when running unit tests on armv7l. |
66 | + * Build-depend on python3-debian for wrap-and-sort. |
67 | + |
68 | + [ XiaoGuo Liu ] |
69 | + * Fix AdaptivePageLayout documentation. |
70 | + |
71 | + [ Tim Peeters ] |
72 | + * Properly disable left/right arrows on sections when at the beginning/end of |
73 | + the list. Fixes LP: #1551356. |
74 | + * Sections and old AppHeader landscape mode. Fixes LP: #1551341. |
75 | + * Set the window color as soon as the window is available, to avoid a |
76 | + flickering background when it is updated later. |
77 | + Fixes LP: #1439133, LP: #1554897 |
78 | + * Add theme, style and styleName properties to Dialog and Popover. |
79 | + Fixes LP: #1555548 |
80 | + * Update the gallery script to use the new name of the export script. |
81 | + * Export the full list of library paths. |
82 | + * Prevent Page geometry changes in APL when changing Pages in a column. |
83 | + * Fix typo in DatePickerStyle. Fixes: LP #1561440. |
84 | + |
85 | + [ Zsombor Egri ] |
86 | + * ListItem focus navigation in ListView and other views. |
87 | + Fixes LP: #1523815, LP: #1536679, LP: #1549733, LP: #1549743 |
88 | + * BorromEdge.preloadContent. Fixes LP: #1540454. |
89 | + * Asynchronous loader (AsyncLoader) using incubator, prerequisite for |
90 | + BottomEdge preloading its content. Fixes LP: #1540454. |
91 | + * ListView proxy should not consume up/down key events. Fixes LP: #1554447 |
92 | + * Pick up the right style. Fixes LP: #1555797 |
93 | + * Label makes sure the color alteration is known by the theming. |
94 | + Fixes LP: #1555784 |
95 | + * Fix AsyncLoader tests so they create slightly less amount of elements. |
96 | + * AdaptivePageLayout removes all pages pushed to next columns when |
97 | + addPageToNextColumn() is called. Fixes LP: #1544745 |
98 | + * Fix BottomEdge content discarding. |
99 | + * Disconnect enabled signal in Label in destructor, so functor call will not |
100 | + be handled when QQuickItem triggers enabled change. Fixes LP: #1560044. |
101 | + |
102 | + |
103 | + [ Andrea Bernabei ] |
104 | + * UI Gallery: fix vertical alignment of labels in left panel list items. |
105 | + * ScrollView: add horizontalScrollbar and verticalScrollbar properties to |
106 | + allow custom properties and styling of scrollbars. |
107 | + * Change Scrollbar default top and bottom anchor margins. Tests included. |
108 | + |
109 | + [ Albert Astals Cid ] |
110 | + * Use "/" instead of QDir::separator for building paths that will be passed |
111 | + to Qt. |
112 | + * Some string optimizations in the icon searching code |
113 | + * Improve icon file searching. Leave searching in hicolor to the end. Do not |
114 | + search on icon themes we've already searched. |
115 | + |
116 | + [ Zoltán Balogh ] |
117 | + * Clean up examples. |
118 | + * Improve unit test plan tool |
119 | + |
120 | + [ Florian Boucault ] |
121 | + * Properly disable PerformanceMonitor for toolkit tests only. Re-enable it for |
122 | + everything else. |
123 | + |
124 | + [ Pierre Bertet ] |
125 | + * Fix the lists style in the offline documentation. Fixes LP: #1557472. |
126 | + * Make export_qml_dir.sh compatible with ZSH. |
127 | + |
128 | + [ CI Train Bot ] |
129 | + * No-change rebuild. |
130 | + |
131 | + -- Zoltan Balogh <zoltan.balogh@canonical.com> Mon, 04 Apr 2016 04:47:18 +0000 |
132 | + |
133 | +>>>>>>> MERGE-SOURCE |
134 | ubuntu-ui-toolkit (1.3.1872+16.04.20160330.2-0ubuntu1) xenial; urgency=medium |
135 | |
136 | [ Tim Peeters ] |
137 | |
138 | === modified file 'debian/control' |
139 | --- debian/control 2016-04-08 14:07:07 +0000 |
140 | +++ debian/control 2016-04-08 18:13:18 +0000 |
141 | @@ -76,76 +76,146 @@ |
142 | suru-icon-theme, |
143 | ttf-ubuntu-font-family, |
144 | ubuntu-ui-toolkit-theme (= ${binary:Version}), |
145 | - ${misc:Depends}, |
146 | - ${shlibs:Depends}, |
147 | -Conflicts: qt-components-ubuntu, |
148 | -Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
149 | -Replaces: qt-components-ubuntu, |
150 | - qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
151 | -Provides: qt-components-ubuntu, |
152 | -Description: Qt Components for Ubuntu - Components QML plugin |
153 | - Qt Components for Ubuntu offers a set of reusable user interface |
154 | - components for Qt Quick 2 / QML. |
155 | - . |
156 | - This package contains the Ubuntu Components QML plugin. |
157 | - |
158 | -Package: qml-module-ubuntu-layouts |
159 | -Architecture: any |
160 | -Multi-Arch: same |
161 | -Pre-Depends: dpkg (>= 1.15.6~), |
162 | - ${misc:Pre-Depends}, |
163 | -Depends: ${misc:Depends}, |
164 | - ${shlibs:Depends}, |
165 | -Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
166 | -Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
167 | -Description: Qt Components for Ubuntu - Layouts QML plugin |
168 | - Qt Components for Ubuntu offers a set of reusable user interface |
169 | - components for Qt Quick 2 / QML. |
170 | - . |
171 | - This package contains the Ubuntu Layouts QML plugin. |
172 | - |
173 | -Package: qml-module-ubuntu-test |
174 | -Architecture: any |
175 | -Multi-Arch: same |
176 | -Pre-Depends: dpkg (>= 1.15.6~), |
177 | - ${misc:Pre-Depends}, |
178 | -Depends: qml-module-qttest | qtdeclarative5-test-plugin, |
179 | - qml-module-ubuntu-components, |
180 | - ${misc:Depends}, |
181 | - ${shlibs:Depends}, |
182 | -Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
183 | -Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
184 | -Description: Qt Components for Ubuntu - Test QML plugin |
185 | - Qt Components for Ubuntu offers a set of reusable user interface |
186 | - components for Qt Quick 2 / QML. |
187 | - . |
188 | - This package contains the Ubuntu Test QML plugin. |
189 | - |
190 | -Package: qml-module-ubuntu-performancemetrics |
191 | -Architecture: any |
192 | -Multi-Arch: same |
193 | -Pre-Depends: dpkg (>= 1.15.6~), |
194 | - ${misc:Pre-Depends}, |
195 | -Depends: ${misc:Depends}, |
196 | - ${shlibs:Depends}, |
197 | -Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
198 | -Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
199 | -Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin |
200 | - Qt Components for Ubuntu offers a set of reusable user interface |
201 | - components for Qt Quick 2 / QML. |
202 | - . |
203 | - This package contains the Ubuntu PerformanceMetrics QML plugin. |
204 | - |
205 | -Package: qtdeclarative5-ubuntu-ui-toolkit-plugin |
206 | -Architecture: any |
207 | -Section: oldlibs |
208 | -Depends: qml-module-ubuntu-components, |
209 | - qml-module-ubuntu-layouts, |
210 | - qml-module-ubuntu-performancemetrics, |
211 | - qml-module-ubuntu-test, |
212 | - ${misc:Depends}, |
213 | -Description: Transitional dummy package for Ubuntu UI Toolkit QML plugin |
214 | - This package contains the Ubuntu Components QML plugin. |
215 | +<<<<<<< TREE |
216 | + ${misc:Depends}, |
217 | + ${shlibs:Depends}, |
218 | +Conflicts: qt-components-ubuntu, |
219 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
220 | +Replaces: qt-components-ubuntu, |
221 | + qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
222 | +Provides: qt-components-ubuntu, |
223 | +Description: Qt Components for Ubuntu - Components QML plugin |
224 | + Qt Components for Ubuntu offers a set of reusable user interface |
225 | + components for Qt Quick 2 / QML. |
226 | + . |
227 | + This package contains the Ubuntu Components QML plugin. |
228 | + |
229 | +Package: qml-module-ubuntu-layouts |
230 | +Architecture: any |
231 | +Multi-Arch: same |
232 | +Pre-Depends: dpkg (>= 1.15.6~), |
233 | + ${misc:Pre-Depends}, |
234 | +Depends: ${misc:Depends}, |
235 | + ${shlibs:Depends}, |
236 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
237 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
238 | +Description: Qt Components for Ubuntu - Layouts QML plugin |
239 | + Qt Components for Ubuntu offers a set of reusable user interface |
240 | + components for Qt Quick 2 / QML. |
241 | + . |
242 | + This package contains the Ubuntu Layouts QML plugin. |
243 | + |
244 | +Package: qml-module-ubuntu-test |
245 | +Architecture: any |
246 | +Multi-Arch: same |
247 | +Pre-Depends: dpkg (>= 1.15.6~), |
248 | + ${misc:Pre-Depends}, |
249 | +Depends: qml-module-qttest | qtdeclarative5-test-plugin, |
250 | + qml-module-ubuntu-components, |
251 | + ${misc:Depends}, |
252 | + ${shlibs:Depends}, |
253 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
254 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
255 | +Description: Qt Components for Ubuntu - Test QML plugin |
256 | + Qt Components for Ubuntu offers a set of reusable user interface |
257 | + components for Qt Quick 2 / QML. |
258 | + . |
259 | + This package contains the Ubuntu Test QML plugin. |
260 | + |
261 | +Package: qml-module-ubuntu-performancemetrics |
262 | +Architecture: any |
263 | +Multi-Arch: same |
264 | +Pre-Depends: dpkg (>= 1.15.6~), |
265 | + ${misc:Pre-Depends}, |
266 | +Depends: ${misc:Depends}, |
267 | + ${shlibs:Depends}, |
268 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
269 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
270 | +Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin |
271 | + Qt Components for Ubuntu offers a set of reusable user interface |
272 | + components for Qt Quick 2 / QML. |
273 | + . |
274 | + This package contains the Ubuntu PerformanceMetrics QML plugin. |
275 | + |
276 | +Package: qtdeclarative5-ubuntu-ui-toolkit-plugin |
277 | +Architecture: any |
278 | +Section: oldlibs |
279 | +Depends: qml-module-ubuntu-components, |
280 | + qml-module-ubuntu-layouts, |
281 | + qml-module-ubuntu-performancemetrics, |
282 | + qml-module-ubuntu-test, |
283 | + ${misc:Depends}, |
284 | +Description: Transitional dummy package for Ubuntu UI Toolkit QML plugin |
285 | + This package contains the Ubuntu Components QML plugin. |
286 | +======= |
287 | + ${misc:Depends}, |
288 | + ${shlibs:Depends}, |
289 | +Conflicts: qt-components-ubuntu, |
290 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
291 | +Replaces: qt-components-ubuntu, |
292 | + qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
293 | +Provides: qt-components-ubuntu, |
294 | +Description: Qt Components for Ubuntu - Components QML plugin |
295 | + Qt Components for Ubuntu offers a set of reusable user interface |
296 | + components for Qt Quick 2 / QML. |
297 | + . |
298 | + This package contains the Ubuntu Components QML plugin. |
299 | + |
300 | +Package: qml-module-ubuntu-layouts |
301 | +Architecture: any |
302 | +Multi-Arch: same |
303 | +Pre-Depends: dpkg (>= 1.15.6~), |
304 | + ${misc:Pre-Depends}, |
305 | +Depends: ${misc:Depends}, |
306 | + ${shlibs:Depends}, |
307 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
308 | +Description: Qt Components for Ubuntu - Layouts QML plugin |
309 | + Qt Components for Ubuntu offers a set of reusable user interface |
310 | + components for Qt Quick 2 / QML. |
311 | + . |
312 | + This package contains the Ubuntu Layouts QML plugin. |
313 | + |
314 | +Package: qml-module-ubuntu-test |
315 | +Architecture: any |
316 | +Multi-Arch: same |
317 | +Pre-Depends: dpkg (>= 1.15.6~), |
318 | + ${misc:Pre-Depends}, |
319 | +Depends: qml-module-qttest | qtdeclarative5-test-plugin, |
320 | + qml-module-ubuntu-components, |
321 | + ${misc:Depends}, |
322 | + ${shlibs:Depends}, |
323 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
324 | +Description: Qt Components for Ubuntu - Test QML plugin |
325 | + Qt Components for Ubuntu offers a set of reusable user interface |
326 | + components for Qt Quick 2 / QML. |
327 | + . |
328 | + This package contains the Ubuntu Test QML plugin. |
329 | + |
330 | +Package: qml-module-ubuntu-performancemetrics |
331 | +Architecture: any |
332 | +Multi-Arch: same |
333 | +Pre-Depends: dpkg (>= 1.15.6~), |
334 | + ${misc:Pre-Depends}, |
335 | +Depends: ${misc:Depends}, |
336 | + ${shlibs:Depends}, |
337 | +Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}), |
338 | +Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin |
339 | + Qt Components for Ubuntu offers a set of reusable user interface |
340 | + components for Qt Quick 2 / QML. |
341 | + . |
342 | + This package contains the Ubuntu PerformanceMetrics QML plugin. |
343 | + |
344 | +Package: qtdeclarative5-ubuntu-ui-toolkit-plugin |
345 | +Architecture: any |
346 | +Section: oldlibs |
347 | +Depends: qml-module-ubuntu-components, |
348 | + qml-module-ubuntu-layouts, |
349 | + qml-module-ubuntu-performancemetrics, |
350 | + qml-module-ubuntu-test, |
351 | + ${misc:Depends}, |
352 | +Description: Transitional dummy package for Ubuntu UI Toolkit QML plugin |
353 | + This package contains the Ubuntu Components QML plugin. |
354 | +>>>>>>> MERGE-SOURCE |
355 | |
356 | Package: libubuntugestures5 |
357 | Architecture: any |
358 | |
359 | === added file 'debian/control.gles' |
360 | --- debian/control.gles 1970-01-01 00:00:00 +0000 |
361 | +++ debian/control.gles 2016-04-08 18:13:18 +0000 |
362 | @@ -0,0 +1,198 @@ |
363 | +Source: ubuntu-ui-toolkit-gles |
364 | +Priority: optional |
365 | +Section: libs |
366 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
367 | +Build-Depends: accountsservice, |
368 | + dbus, |
369 | + dbus-test-runner, |
370 | + debhelper (>= 9.0.0), |
371 | + devscripts, |
372 | + gdb, |
373 | + language-pack-en-base, |
374 | + libdbus-1-dev, |
375 | + libfontconfig1-dev, |
376 | + libfreetype6-dev, |
377 | + libgles2-mesa-dev, |
378 | + libglib2.0-dev, |
379 | + libinput-dev, |
380 | + liblttng-ust-dev, |
381 | + libmtdev-dev, |
382 | + libnih-dbus-dev, |
383 | + libqt5gui5-gles, |
384 | + libqt5organizer5, |
385 | + libqt5quick5-gles, |
386 | + libqt5quickparticles5-gles, |
387 | + libqt5quickwidgets5-gles, |
388 | + libqt5sql5-sqlite, |
389 | + libqt5svg5-dev, |
390 | + libudev-dev, |
391 | + libx11-dev[!armhf], |
392 | + libxcb1-dev[!armhf], |
393 | + libxi-dev[!armhf], |
394 | + libxkbcommon-dev, |
395 | + libxrender-dev, |
396 | + locales, |
397 | + python-autopilot (>= 1.4), |
398 | + python3-sphinx, |
399 | + python3:any, |
400 | + python:any, |
401 | + qml-module-qt-labs-settings, |
402 | + qml-module-qtgraphicaleffects, |
403 | + qml-module-qtqml-models2, |
404 | + qml-module-qtquick-layouts, |
405 | + qml-module-qtquick-localstorage, |
406 | + qml-module-qtquick-window2, |
407 | + qml-module-qtquick2, |
408 | + qml-module-qttest, |
409 | + qtbase5-dev-tools, |
410 | + qtbase5-gles-dev, |
411 | + qtbase5-private-gles-dev, |
412 | + qtdeclarative5-dev-tools, |
413 | + qtdeclarative5-doc-html, |
414 | + qtdeclarative5-private-dev, |
415 | + qtdeclarative5-qtfeedback-plugin, |
416 | + qtdeclarative5-unity-action-plugin (>= 1.1.0), |
417 | + qtmultimedia5-doc-html, |
418 | + qtpim5-dev, |
419 | + qtscript5-doc-html, |
420 | + qtsvg5-doc-html, |
421 | + qtwebkit5-doc-html, |
422 | + suru-icon-theme, |
423 | + unity-action-doc, |
424 | + uuid-runtime, |
425 | + xvfb, |
426 | +Standards-Version: 3.9.7 |
427 | +Homepage: https://launchpad.net/ubuntu-ui-toolkit |
428 | + |
429 | +Package: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles |
430 | +Section: oldlibs |
431 | +Architecture: amd64 i386 |
432 | +Multi-Arch: same |
433 | +Depends: qml-module-ubuntu-components-gles, |
434 | + ${misc:Depends}, |
435 | +Description: Transitional package for Qt Components for Ubuntu, OpenGLES |
436 | + Qt Components for Ubuntu offers a set of reusable user interface |
437 | + components for Qt Quick 2 / QML. |
438 | + . |
439 | + This is a transitional package that is safe to remove. |
440 | + . |
441 | + This is the OpenGL ES version for amd64 and i386. |
442 | + |
443 | +Package: qml-module-ubuntu-components-gles |
444 | +Architecture: amd64 i386 |
445 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}), |
446 | +Conflicts: qml-module-ubuntu-components, |
447 | + qtdeclarative5-ubuntu-ui-toolkit-plugin, |
448 | +Replaces: qml-module-ubuntu-components, |
449 | + qtdeclarative5-ubuntu-ui-toolkit-plugin, |
450 | + qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}), |
451 | +Provides: qml-module-ubuntu-components, |
452 | +Multi-Arch: same |
453 | +Pre-Depends: dpkg (>= 1.15.6~), |
454 | + ${misc:Pre-Depends}, |
455 | +Depends: libqt5svg5, |
456 | + libubuntugestures5-gles (= ${binary:Version}), |
457 | + libubuntutoolkit5-gles (= ${binary:Version}), |
458 | + qml-module-qtfeedback, |
459 | + qml-module-qtgraphicaleffects, |
460 | + qml-module-qtquick-layouts, |
461 | + qml-module-qtquick-window2, |
462 | + qml-module-qtquick2, |
463 | + qtdeclarative5-unity-action-plugin (>= 1.1.0), |
464 | + suru-icon-theme, |
465 | + ttf-ubuntu-font-family, |
466 | + ubuntu-ui-toolkit-theme, |
467 | + ${misc:Depends}, |
468 | + ${shlibs:Depends}, |
469 | +Description: Qt Components for Ubuntu - QML plugin - GLES |
470 | + Qt Components for Ubuntu offers a set of reusable user interface |
471 | + components for Qt Quick 2 / QML. |
472 | + . |
473 | + This package contains the Ubuntu Components QML plugin (built with |
474 | + the OpenGLES backend). |
475 | + |
476 | +Package: qml-module-ubuntu-performancemetrics-gles |
477 | +Architecture: amd64 i386 |
478 | +Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}), |
479 | +Conflicts: qml-module-ubuntu-performancemetrics, |
480 | +Replaces: qml-module-ubuntu-performancemetrics, |
481 | + qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}), |
482 | +Provides: qml-module-ubuntu-performancemetrics, |
483 | +Multi-Arch: same |
484 | +Pre-Depends: dpkg (>= 1.15.6~), |
485 | + ${misc:Pre-Depends}, |
486 | +Depends: ${misc:Depends}, |
487 | + ${shlibs:Depends}, |
488 | +Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin - GLES |
489 | + Qt Components for Ubuntu offers a set of reusable user interface |
490 | + components for Qt Quick 2 / QML. |
491 | + . |
492 | + This package contains the Ubuntu PerformanceMetrics QML plugin. |
493 | + . |
494 | + This is the OpenGL ES version for amd64 and i386. |
495 | + |
496 | +Package: libubuntugestures5-gles |
497 | +Architecture: amd64 i386 |
498 | +Conflicts: libubuntugestures5, |
499 | +Replaces: libubuntugestures5, |
500 | +Provides: libubuntugestures5, |
501 | +Multi-Arch: same |
502 | +Pre-Depends: dpkg (>= 1.15.6~), |
503 | + ${misc:Pre-Depends}, |
504 | +Depends: ${misc:Depends}, |
505 | + ${shlibs:Depends}, |
506 | +Description: Gestures library for Ubuntu UI Toolkit - GLES |
507 | + Library supporting Gesture recognition for Ubuntu UI Toolkit |
508 | + Classes for SwipeArea, and for Ubuntu Gestures in general. |
509 | + . |
510 | + This is the OpenGL ES version for amd64 and i386. |
511 | + |
512 | +Package: libubuntugestures5-gles-dev |
513 | +Architecture: amd64 i386 |
514 | +Conflicts: libubuntugestures5-dev, |
515 | +Replaces: libubuntugestures5-dev, |
516 | +Provides: libubuntugestures5-dev, |
517 | +Multi-Arch: same |
518 | +Section: libdevel |
519 | +Pre-Depends: dpkg (>= 1.15.6~), |
520 | + ${misc:Pre-Depends}, |
521 | +Depends: ${misc:Depends}, |
522 | + ${shlibs:Depends}, |
523 | +Description: Ubuntu gestures library development files - GLES |
524 | + This package contains the development files for |
525 | + Ubuntu gestures library with SwipeArea |
526 | + . |
527 | + This is the OpenGL ES version for amd64 and i386. |
528 | + |
529 | +Package: libubuntutoolkit5-gles |
530 | +Architecture: amd64 i386 |
531 | +Multi-Arch: same |
532 | +Conflicts: libubuntutoolkit5, |
533 | +Replaces: libubuntutoolkit5, |
534 | +Provides: libubuntutoolkit5, |
535 | +Pre-Depends: dpkg (>= 1.15.6~), |
536 | + ${misc:Pre-Depends}, |
537 | +Depends: ${misc:Depends}, |
538 | + ${shlibs:Depends}, |
539 | +Description: Ubuntu toolkit common library for Ubuntu UI Toolkit - GLES |
540 | + Contains components and helper classes that are shared between the |
541 | + Ubuntu QML plugins |
542 | + . |
543 | + This is the OpenGL ES version for amd64 and i386. |
544 | + |
545 | +Package: libubuntutoolkit5-gles-dev |
546 | +Architecture: amd64 i386 |
547 | +Multi-Arch: same |
548 | +Section: libdevel |
549 | +Conflicts: libubuntutoolkit5-dev, |
550 | +Replaces: libubuntutoolkit5-dev, |
551 | +Provides: libubuntutoolkit5-dev, |
552 | +Pre-Depends: dpkg (>= 1.15.6~), |
553 | + ${misc:Pre-Depends}, |
554 | +Depends: ${misc:Depends}, |
555 | + ${shlibs:Depends}, |
556 | +Description: Ubuntu toolkit common library development files - GLES |
557 | + This package contains the development files for |
558 | + Ubuntu toolkit common library |
559 | + . |
560 | + This is the OpenGL ES version for amd64 and i386. |
561 | |
562 | === added file 'debian/rules.gles' |
563 | --- debian/rules.gles 1970-01-01 00:00:00 +0000 |
564 | +++ debian/rules.gles 2016-04-08 18:13:18 +0000 |
565 | @@ -0,0 +1,33 @@ |
566 | +#!/usr/bin/make -f |
567 | + |
568 | +# Uncomment this to turn on verbose mode. |
569 | +# export DH_VERBOSE=1 |
570 | +export QT_SELECT := qt5 |
571 | +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 |
572 | +export QMAKEFEATURES=$(CURDIR)/features |
573 | +DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) |
574 | +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) |
575 | + |
576 | +CONFIGURE_SWITCHES = "-r" \ |
577 | + "ROOT_SOURCE_DIR=$(CURDIR)" \ |
578 | + "ROOT_BUILD_DIR=$(CURDIR)" |
579 | + |
580 | +%: |
581 | + dh $@ --parallel |
582 | + |
583 | +override_dh_auto_configure: |
584 | + qmake -r |
585 | + #dh_auto_configure -- $(CONFIGURE_SWITCHES) |
586 | + |
587 | +override_dh_auto_test: |
588 | +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) |
589 | + mkdir -p debian/tmp/home/run |
590 | + chmod +x tests/xvfb.sh |
591 | + tests/xvfb.sh dh_auto_test || exit $? |
592 | +endif |
593 | + |
594 | +override_dh_auto_install: |
595 | + dh_auto_install --destdir=debian/tmp |
596 | + |
597 | +override_dh_shlibdeps: |
598 | + dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTI_ARCH)/ |
FAILED: Continuous integration, rev:1294 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/2303/ jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- vivid-amd64- ci/126/ console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- vivid-armhf- ci/127/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- ui-toolkit- ci/2303/ rebuild
http://