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