Merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10-gles into lp:ubuntu-ui-toolkit/gles

Proposed by Zoltan Balogh on 2016-03-10
Status: Merged
Approved by: Zoltan Balogh on 2016-04-05
Approved revision: 132
Merged at revision: 114
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10-gles
Merge into: lp:ubuntu-ui-toolkit/gles
Diff against target: 952 lines (+399/-327) (has conflicts)
9 files modified
debian/changelog (+10/-0)
debian/control (+133/-75)
debian/copyright (+209/-209)
debian/libubuntugestures5-gles-dev.install (+22/-23)
debian/libubuntutoolkit5-gles-dev.install (+1/-1)
debian/qml-module-ubuntu-components-gles.install (+18/-18)
debian/qml-module-ubuntu-components-gles.lintian-overrides (+1/-1)
debian/qml-module-ubuntu-performancemetrics-gles.install (+4/-0)
debian/rules (+1/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-03-10 Pending
Review via email: mp+288607@code.launchpad.net

Commit message

OTA10 landing 2016-03-10 gles

Description of the change

OTA10 landing 2016-03-10 gles

To post a comment you must log in.
124. By Zoltan Balogh on 2016-03-10

Sync

125. By Zoltan Balogh on 2016-03-15

Sync with staging

126. By Zoltan Balogh on 2016-03-15

export QT_SELECT in rules

127. By Zoltan Balogh on 2016-03-15

sync with staging

128. By Zoltan Balogh on 2016-03-16

Sync with staging

129. By Zoltan Balogh on 2016-03-16

Clean up changelog

130. By Zoltan Balogh on 2016-03-16

Fix rules

131. By Zoltan Balogh on 2016-03-23

Sync with staging

132. By Zoltan Balogh on 2016-04-04

Update from staging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-03-30 23:08:56 +0000
3+++ debian/changelog 2016-04-04 04:43:28 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ubuntu-ui-toolkit-gles (1.3.1872+16.04.20160330.2-0ubuntu1) xenial; urgency=medium
7
8 [ Zoltán Balogh ]
9@@ -7,6 +8,15 @@
10
11 -- Zoltan Balogh <zoltan.balogh@canonical.com> Wed, 30 Mar 2016 23:08:55 +0000
12
13+=======
14+ubuntu-ui-toolkit-gles (1.3.1918+16.04-0ubuntu1) UNRELEASED; urgency=medium
15+
16+ [ Zoltán Balogh ]
17+ * Sync with the main package 1.3.1918+16.04-0ubuntu1
18+
19+ -- Zoltán Balogh <zoltan@bakter.hu> Thu, 10 Mar 2016 07:55:20 +0200
20+
21+>>>>>>> MERGE-SOURCE
22 ubuntu-ui-toolkit-gles (1.3.1872+16.04.20160314-0ubuntu1) xenial; urgency=medium
23
24 [ Zoltán Balogh ]
25
26=== modified file 'debian/control'
27--- debian/control 2016-02-17 13:04:22 +0000
28+++ debian/control 2016-04-04 04:43:28 +0000
29@@ -2,136 +2,194 @@
30 Priority: optional
31 Section: libs
32 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
33-Build-Depends: debhelper (>= 9.0.0),
34+Build-Depends: accountsservice,
35+ dbus,
36+ dbus-test-runner,
37+ debhelper (>= 9.0.0),
38 devscripts,
39+ gdb,
40+ language-pack-en-base,
41+ libdbus-1-dev,
42+ libfontconfig1-dev,
43+ libfreetype6-dev,
44 libgles2-mesa-dev,
45 libglib2.0-dev,
46+ libinput-dev,
47+ liblttng-ust-dev,
48+ libmtdev-dev,
49+ libnih-dbus-dev,
50+ libqt5gui5-gles,
51+ libqt5organizer5,
52+ libqt5quick5-gles,
53+ libqt5quickparticles5-gles,
54+ libqt5quickwidgets5-gles,
55+ libqt5sql5-sqlite,
56+ libqt5svg5-dev,
57+ libudev-dev,
58+ libxkbcommon-dev,
59+ libxrender-dev,
60+ locales,
61+ python-autopilot (>= 1.4),
62+ python3-sphinx,
63 python3:any,
64 python:any,
65- qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
66- libinput-dev,
67- libxkbcommon-dev,
68+ qml-module-qt-labs-settings,
69+ qml-module-qtgraphicaleffects,
70+ qml-module-qtqml-models2,
71+ qml-module-qtquick-layouts,
72+ qml-module-qtquick-localstorage,
73+ qml-module-qtquick-window2,
74+ qml-module-qtquick2,
75+ qml-module-qttest,
76+ qtbase5-dev-tools,
77 qtbase5-gles-dev,
78- qtbase5-dev-tools,
79- libqt5organizer5,
80- qt5-default,
81 qtbase5-private-gles-dev,
82- libqt5sql5-sqlite,
83 qtdeclarative5-dev-tools,
84+ qtdeclarative5-doc-html,
85 qtdeclarative5-private-dev,
86- qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
87- qml-module-qttest | qtdeclarative5-test-plugin,
88- qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
89- qml-module-qt-labs-settings | qtdeclarative5-settings-plugin,
90- qml-module-qtquick-layouts,
91 qtdeclarative5-qtfeedback-plugin,
92 qtdeclarative5-unity-action-plugin (>= 1.1.0),
93- qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
94- qml-module-qtqml-models2,
95- qtdeclarative5-doc-html,
96- qtwebkit5-doc-html,
97- qtsvg5-doc-html,
98- libqt5svg5-dev,
99- qtscript5-doc-html,
100 qtmultimedia5-doc-html,
101- unity-action-doc,
102- devscripts,
103 qtpim5-dev,
104- language-pack-en-base,
105- libdbus-1-dev,
106- libnih-dbus-dev,
107- dbus,
108- dbus-test-runner,
109- accountsservice,
110- xvfb,
111- gdb,
112- locales,
113+ qtscript5-doc-html,
114+ qtsvg5-doc-html,
115+ qtwebkit5-doc-html,
116 suru-icon-theme,
117+ unity-action-doc,
118 uuid-runtime,
119- python-autopilot (>= 1.4),
120- python3-sphinx,
121- libfontconfig1-dev,
122- libfreetype6-dev,
123- libmtdev-dev,
124- libudev-dev,
125- libxrender-dev,
126- libqt5gui5-gles,
127- libqt5quick5-gles,
128- libqt5quickparticles5-gles,
129- libqt5quickwidgets5-gles,
130- liblttng-ust-dev,
131-Standards-Version: 3.9.4
132+ xvfb,
133+Standards-Version: 3.9.7
134 Homepage: https://launchpad.net/ubuntu-ui-toolkit
135
136 Package: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles
137-Architecture: i386 amd64
138-Conflicts: qtdeclarative5-ubuntu-ui-toolkit-plugin
139-Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin
140-Provides: qtdeclarative5-ubuntu-ui-toolkit-plugin
141-Multi-Arch: same
142-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
143-Depends: libqt5qml-graphicaleffects | libqt5graphicaleffects5,
144- libqt5svg5,
145- qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
146- qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
147+Section: oldlibs
148+Architecture: amd64 i386
149+Multi-Arch: same
150+Depends: qml-module-ubuntu-components-gles,
151+ ${misc:Depends},
152+Description: Transitional package for Qt Components for Ubuntu, OpenGLES
153+ Qt Components for Ubuntu offers a set of reusable user interface
154+ components for Qt Quick 2 / QML.
155+ .
156+ This is a transitional package that is safe to remove.
157+ .
158+ This is the OpenGL ES version for amd64 and i386.
159+
160+Package: qml-module-ubuntu-components-gles
161+Architecture: amd64 i386
162+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
163+Conflicts: qml-module-ubuntu-components,
164+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
165+Replaces: qml-module-ubuntu-components,
166+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
167+ qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
168+Provides: qml-module-ubuntu-components,
169+Multi-Arch: same
170+Pre-Depends: dpkg (>= 1.15.6~),
171+ ${misc:Pre-Depends},
172+Depends: libqt5svg5,
173+ libubuntugestures5-gles (= ${binary:Version}),
174+ libubuntutoolkit5-gles (= ${binary:Version}),
175+ qml-module-qtfeedback,
176+ qml-module-qtgraphicaleffects,
177 qml-module-qtquick-layouts,
178- qtdeclarative5-qtfeedback-plugin,
179+ qml-module-qtquick-window2,
180+ qml-module-qtquick2,
181 qtdeclarative5-unity-action-plugin (>= 1.1.0),
182 suru-icon-theme,
183 ttf-ubuntu-font-family,
184 ubuntu-ui-toolkit-theme,
185- libubuntugestures5-gles (= ${binary:Version}),
186 ${misc:Depends},
187 ${shlibs:Depends},
188-Description: Qt Components for Ubuntu - QML plugin - OpenGLES
189+Description: Qt Components for Ubuntu - QML plugin - GLES
190 Qt Components for Ubuntu offers a set of reusable user interface
191 components for Qt Quick 2 / QML.
192 .
193 This package contains the Ubuntu Components QML plugin (built with
194 the OpenGLES backend).
195
196+Package: qml-module-ubuntu-performancemetrics-gles
197+Architecture: amd64 i386
198+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
199+Conflicts: qml-module-ubuntu-performancemetrics,
200+Replaces: qml-module-ubuntu-performancemetrics,
201+ qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
202+Provides: qml-module-ubuntu-performancemetrics,
203+Multi-Arch: same
204+Pre-Depends: dpkg (>= 1.15.6~),
205+ ${misc:Pre-Depends},
206+Depends: ${misc:Depends},
207+ ${shlibs:Depends},
208+Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin - GLES
209+ Qt Components for Ubuntu offers a set of reusable user interface
210+ components for Qt Quick 2 / QML.
211+ .
212+ This package contains the Ubuntu PerformanceMetrics QML plugin.
213+ .
214+ This is the OpenGL ES version for amd64 and i386.
215+
216 Package: libubuntugestures5-gles
217-Architecture: i386 amd64
218-Conflicts: libubuntugestures5
219-Replaces: libubuntugestures5
220-Provides: libubuntugestures5
221+Architecture: amd64 i386
222+Conflicts: libubuntugestures5,
223+Replaces: libubuntugestures5,
224+Provides: libubuntugestures5,
225 Multi-Arch: same
226-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
227+Pre-Depends: dpkg (>= 1.15.6~),
228+ ${misc:Pre-Depends},
229 Depends: ${misc:Depends},
230 ${shlibs:Depends},
231-Description: Gestures library for Ubuntu UI Toolkit - OpenGLES
232+Description: Gestures library for Ubuntu UI Toolkit - GLES
233 Library supporting Gesture recognition for Ubuntu UI Toolkit
234 Classes for SwipeArea, and for Ubuntu Gestures in general.
235+ .
236+ This is the OpenGL ES version for amd64 and i386.
237
238 Package: libubuntugestures5-gles-dev
239-Architecture: i386 amd64
240-Conflicts: libubuntugestures5-dev
241-Replaces: libubuntugestures5-dev
242-Provides: libubuntugestures5-dev
243+Architecture: amd64 i386
244+Conflicts: libubuntugestures5-dev,
245+Replaces: libubuntugestures5-dev,
246+Provides: libubuntugestures5-dev,
247 Multi-Arch: same
248-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
249+Section: libdevel
250+Pre-Depends: dpkg (>= 1.15.6~),
251+ ${misc:Pre-Depends},
252 Depends: ${misc:Depends},
253 ${shlibs:Depends},
254-Description: Ubuntu gestures library development files - OpenGLES
255+Description: Ubuntu gestures library development files - GLES
256 This package contains the development files for
257 Ubuntu gestures library with SwipeArea
258+ .
259+ This is the OpenGL ES version for amd64 and i386.
260
261 Package: libubuntutoolkit5-gles
262-Architecture: i386 amd64
263+Architecture: amd64 i386
264 Multi-Arch: same
265-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
266+Conflicts: libubuntutoolkit5,
267+Replaces: libubuntutoolkit5,
268+Provides: libubuntutoolkit5,
269+Pre-Depends: dpkg (>= 1.15.6~),
270+ ${misc:Pre-Depends},
271 Depends: ${misc:Depends},
272 ${shlibs:Depends},
273-Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
274+Description: Ubuntu toolkit common library for Ubuntu UI Toolkit - GLES
275 Contains components and helper classes that are shared between the
276 Ubuntu QML plugins
277+ .
278+ This is the OpenGL ES version for amd64 and i386.
279
280 Package: libubuntutoolkit5-gles-dev
281-Architecture: i386 amd64
282+Architecture: amd64 i386
283 Multi-Arch: same
284-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
285+Section: libdevel
286+Conflicts: libubuntutoolkit5-dev,
287+Replaces: libubuntutoolkit5-dev,
288+Provides: libubuntutoolkit5-dev,
289+Pre-Depends: dpkg (>= 1.15.6~),
290+ ${misc:Pre-Depends},
291 Depends: ${misc:Depends},
292 ${shlibs:Depends},
293-Description: Ubuntu toolkit common library development files
294+Description: Ubuntu toolkit common library development files - GLES
295 This package contains the development files for
296 Ubuntu toolkit common library
297+ .
298+ This is the OpenGL ES version for amd64 and i386.
299
300=== modified file 'debian/copyright'
301--- debian/copyright 2014-07-15 17:00:58 +0000
302+++ debian/copyright 2016-04-04 04:43:28 +0000
303@@ -2,13 +2,13 @@
304 Upstream-Name: ubuntu-ui-toolkit
305 Source: https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
306
307-Files: *
308+Files: *
309 Copyright: 2012-2013 Canonical Ltd.
310 License: LGPL-3.0
311
312 Files: modules/Ubuntu/Components/Themes/Ambiance/artwork/*
313-Files: modules/Ubuntu/Components/artwork/*
314-Files: modules/Ubuntu/Components/ListItems/artwork/*
315+ modules/Ubuntu/Components/artwork/*
316+ modules/Ubuntu/Components/ListItems/artwork/*
317 Copyright: 2004-2013, Canonical Ltd.
318 License: CC-BY-SA-3.0
319 Unless otherwise indicated, artwork is available under the Creative
320@@ -17,273 +17,273 @@
321 http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
322 Creative Commons, 171 Second Street, Suite 300, San Francisco,
323 California, 94105, USA. See below for the full text of the license.
324- .
325- Some Rights Reserved:
326- .
327+ .
328+ Some Rights Reserved:
329+ .
330 The rights in the trademarks, logos, service marks of Canonical Ltd,
331 as well as the look and feel of Ubuntu, are not licensed under the
332 Creative Commons license and are subject to the Canonical Trademark
333 Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy
334- .
335- License:
336- .
337- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
338- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
339- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
340- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
341- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
342+ .
343+ License:
344+ .
345+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
346+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
347+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
348+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
349+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
350 DAMAGES RESULTING FROM ITS USE.
351- .
352+ .
353 License
354- .
355- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
356- CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
357- PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
358- WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW
359+ .
360+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
361+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
362+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
363+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW
364 IS PROHIBITED.
365- .
366- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
367+ .
368+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
369 AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU
370- THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
371+ THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
372 TERMS AND CONDITIONS.
373- .
374+ .
375 1. Definitions
376- .
377- 1. "Collective Work" means a work, such as a periodical issue,
378- anthology or encyclopedia, in which the Work in its entirety in
379- unmodified form, along with a number of other contributions,
380- constituting separate and independent works in themselves, are
381- assembled into a collective whole. A work that constitutes a
382- Collective Work will not be considered a Derivative Work
383+ .
384+ 1. "Collective Work" means a work, such as a periodical issue,
385+ anthology or encyclopedia, in which the Work in its entirety in
386+ unmodified form, along with a number of other contributions,
387+ constituting separate and independent works in themselves, are
388+ assembled into a collective whole. A work that constitutes a
389+ Collective Work will not be considered a Derivative Work
390 (as defined below) for the purposes of this License.
391- 2. "Derivative Work" means a work based upon the Work or upon the
392- Work and other pre-existing works, such as a translation, musical
393- arrangement, dramatization, fictionalization, motion picture
394- version, sound recording, art reproduction, abridgment,
395- condensation, or any other form in which the Work may be recast,
396- transformed, or adapted, except that a work that constitutes a
397- Collective Work will not be considered a Derivative Work for the
398- purpose of this License. For the avoidance of doubt, where the Work
399- is a musical composition or sound recording, the synchronization of
400- the Work in timed-relation with a moving image ("synching") will be
401+ 2. "Derivative Work" means a work based upon the Work or upon the
402+ Work and other pre-existing works, such as a translation, musical
403+ arrangement, dramatization, fictionalization, motion picture
404+ version, sound recording, art reproduction, abridgment,
405+ condensation, or any other form in which the Work may be recast,
406+ transformed, or adapted, except that a work that constitutes a
407+ Collective Work will not be considered a Derivative Work for the
408+ purpose of this License. For the avoidance of doubt, where the Work
409+ is a musical composition or sound recording, the synchronization of
410+ the Work in timed-relation with a moving image ("synching") will be
411 considered a Derivative Work for the purpose of this License.
412- 3. "Licensor" means the individual or entity that offers the Work
413+ 3. "Licensor" means the individual or entity that offers the Work
414 under the terms of this License.
415- 4. "Original Author" means the individual or entity who created the
416+ 4. "Original Author" means the individual or entity who created the
417 Work.
418- 5. "Work" means the copyrightable work of authorship offered under
419+ 5. "Work" means the copyrightable work of authorship offered under
420 the terms of this License.
421- 6. "You" means an individual or entity exercising rights under this
422- License who has not previously violated the terms of this License
423- with respect to the Work, or who has received express permission
424- from the Licensor to exercise rights under this License despite a
425+ 6. "You" means an individual or entity exercising rights under this
426+ License who has not previously violated the terms of this License
427+ with respect to the Work, or who has received express permission
428+ from the Licensor to exercise rights under this License despite a
429 previous violation.
430- 7. "License Elements" means the following high-level license
431- attributes as selected by Licensor and indicated in the title of
432+ 7. "License Elements" means the following high-level license
433+ attributes as selected by Licensor and indicated in the title of
434 this License: Attribution, ShareAlike.
435- .
436- 2. Fair Use Rights. Nothing in this license is intended to reduce,
437- limit, or restrict any rights arising from fair use, first sale or
438- other limitations on the exclusive rights of the copyright owner under
439+ .
440+ 2. Fair Use Rights. Nothing in this license is intended to reduce,
441+ limit, or restrict any rights arising from fair use, first sale or
442+ other limitations on the exclusive rights of the copyright owner under
443 copyright law or other applicable laws.
444- .
445- 3. License Grant. Subject to the terms and conditions of this License,
446- Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
447- perpetual (for the duration of the applicable copyright) license to
448+ .
449+ 3. License Grant. Subject to the terms and conditions of this License,
450+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
451+ perpetual (for the duration of the applicable copyright) license to
452 exercise the rights in the Work as stated below:
453- .
454- 1. to reproduce the Work, to incorporate the Work into one or more
455- Collective Works, and to reproduce the Work as incorporated in the
456+ .
457+ 1. to reproduce the Work, to incorporate the Work into one or more
458+ Collective Works, and to reproduce the Work as incorporated in the
459 Collective Works;
460 2. to create and reproduce Derivative Works;
461- 3. to distribute copies or phonorecords of, display publicly,
462- perform publicly, and perform publicly by means of a digital audio
463+ 3. to distribute copies or phonorecords of, display publicly,
464+ perform publicly, and perform publicly by means of a digital audio
465 transmission the Work including as incorporated in Collective Works;
466- 4. to distribute copies or phonorecords of, display publicly,
467- perform publicly, and perform publicly by means of a digital audio
468+ 4. to distribute copies or phonorecords of, display publicly,
469+ perform publicly, and perform publicly by means of a digital audio
470 transmission Derivative Works.
471 5.
472- .
473- For the avoidance of doubt, where the work is a musical
474+ .
475+ For the avoidance of doubt, where the work is a musical
476 composition:
477- 1. Performance Royalties Under Blanket Licenses. Licensor
478- waives the exclusive right to collect, whether individually
479- or via a performance rights society (e.g. ASCAP, BMI, SESAC),
480- royalties for the public performance or public digital
481+ 1. Performance Royalties Under Blanket Licenses. Licensor
482+ waives the exclusive right to collect, whether individually
483+ or via a performance rights society (e.g. ASCAP, BMI, SESAC),
484+ royalties for the public performance or public digital
485 performance (e.g. webcast) of the Work.
486- 2. Mechanical Rights and Statutory Royalties. Licensor waives
487- the exclusive right to collect, whether individually or via a
488- music rights society or designated agent (e.g. Harry Fox
489- Agency), royalties for any phonorecord You create from the
490- Work ("cover version") and distribute, subject to the
491- compulsory license created by 17 USC Section 115 of the US
492+ 2. Mechanical Rights and Statutory Royalties. Licensor waives
493+ the exclusive right to collect, whether individually or via a
494+ music rights society or designated agent (e.g. Harry Fox
495+ Agency), royalties for any phonorecord You create from the
496+ Work ("cover version") and distribute, subject to the
497+ compulsory license created by 17 USC Section 115 of the US
498 Copyright Act (or the equivalent in other jurisdictions).
499- 6. Webcasting Rights and Statutory Royalties. For the avoidance of
500- doubt, where the Work is a sound recording, Licensor waives the
501- exclusive right to collect, whether individually or via a
502- performance-rights society (e.g. SoundExchange), royalties for the
503- public digital performance (e.g. webcast) of the Work, subject to
504- the compulsory license created by 17 USC Section 114 of the US
505+ 6. Webcasting Rights and Statutory Royalties. For the avoidance of
506+ doubt, where the Work is a sound recording, Licensor waives the
507+ exclusive right to collect, whether individually or via a
508+ performance-rights society (e.g. SoundExchange), royalties for the
509+ public digital performance (e.g. webcast) of the Work, subject to
510+ the compulsory license created by 17 USC Section 114 of the US
511 Copyright Act (or the equivalent in other jurisdictions).
512- .
513- The above rights may be exercised in all media and formats whether now
514- known or hereafter devised. The above rights include the right to make
515- such modifications as are technically necessary to exercise the rights
516- in other media and formats. All rights not expressly granted by
517+ .
518+ The above rights may be exercised in all media and formats whether now
519+ known or hereafter devised. The above rights include the right to make
520+ such modifications as are technically necessary to exercise the rights
521+ in other media and formats. All rights not expressly granted by
522 Licensor are hereby reserved.
523- .
524- 4. Restrictions.The license granted in Section 3 above is expressly
525+ .
526+ 4. Restrictions.The license granted in Section 3 above is expressly
527 made subject to and limited by the following restrictions:
528- .
529- 1. You may distribute, publicly display, publicly perform, or
530- publicly digitally perform the Work only under the terms of this
531- License, and You must include a copy of, or the Uniform Resource
532- Identifier for, this License with every copy or phonorecord of the
533+ .
534+ 1. You may distribute, publicly display, publicly perform, or
535+ publicly digitally perform the Work only under the terms of this
536+ License, and You must include a copy of, or the Uniform Resource
537+ Identifier for, this License with every copy or phonorecord of the
538 Work You distribute, publicly display, publicly perform, or publicly
539 digitally perform. You may not offer or impose any terms on the Work
540- that alter or restrict the terms of this License or the recipients'
541+ that alter or restrict the terms of this License or the recipients'
542 exercise of the rights granted hereunder. You may not sublicense the
543- Work. You must keep intact all notices that refer to this License
544- and to the disclaimer of warranties. You may not distribute,
545- publicly display, publicly perform, or publicly digitally perform
546+ Work. You must keep intact all notices that refer to this License
547+ and to the disclaimer of warranties. You may not distribute,
548+ publicly display, publicly perform, or publicly digitally perform
549 the Work with any technological measures that control access or use
550- of the Work in a manner inconsistent with the terms of this License
551- Agreement. The above applies to the Work as incorporated in a
552+ of the Work in a manner inconsistent with the terms of this License
553+ Agreement. The above applies to the Work as incorporated in a
554 Collective Work, but this does not require the Collective Work apart
555- from the Work itself to be made subject to the terms of this
556- License. If You create a Collective Work, upon notice from any
557- Licensor You must, to the extent practicable, remove from the
558+ from the Work itself to be made subject to the terms of this
559+ License. If You create a Collective Work, upon notice from any
560+ Licensor You must, to the extent practicable, remove from the
561 Collective Work any credit as required by clause 4(c), as requested.
562- If You create a Derivative Work, upon notice from any Licensor You
563- must, to the extent practicable, remove from the Derivative Work
564+ If You create a Derivative Work, upon notice from any Licensor You
565+ must, to the extent practicable, remove from the Derivative Work
566 any credit as required by clause 4(c), as requested.
567- 2. You may distribute, publicly display, publicly perform, or
568- publicly digitally perform a Derivative Work only under the terms
569- of this License, a later version of this License with the same
570- License Elements as this License, or a Creative Commons iCommons
571- license that contains the same License Elements as this License
572+ 2. You may distribute, publicly display, publicly perform, or
573+ publicly digitally perform a Derivative Work only under the terms
574+ of this License, a later version of this License with the same
575+ License Elements as this License, or a Creative Commons iCommons
576+ license that contains the same License Elements as this License
577 (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of,
578- or the Uniform Resource Identifier for, this License or other
579- license specified in the previous sentence with every copy or
580- phonorecord of each Derivative Work You distribute, publicly
581- display, publicly perform, or publicly digitally perform. You may
582- not offer or impose any terms on the Derivative Works that alter or
583- restrict the terms of this License or the recipients' exercise of
584- the rights granted hereunder, and You must keep intact all notices
585- that refer to this License and to the disclaimer of warranties.
586- You may not distribute, publicly display, publicly perform, or
587- publicly digitally perform the Derivative Work with any
588- technological measures that control access or use of the Work in a
589- manner inconsistent with the terms of this License Agreement.
590- The above applies to the Derivative Work as incorporated in a
591- Collective Work, but this does not require the Collective Work
592- apart from the Derivative Work itself to be made subject to the
593+ or the Uniform Resource Identifier for, this License or other
594+ license specified in the previous sentence with every copy or
595+ phonorecord of each Derivative Work You distribute, publicly
596+ display, publicly perform, or publicly digitally perform. You may
597+ not offer or impose any terms on the Derivative Works that alter or
598+ restrict the terms of this License or the recipients' exercise of
599+ the rights granted hereunder, and You must keep intact all notices
600+ that refer to this License and to the disclaimer of warranties.
601+ You may not distribute, publicly display, publicly perform, or
602+ publicly digitally perform the Derivative Work with any
603+ technological measures that control access or use of the Work in a
604+ manner inconsistent with the terms of this License Agreement.
605+ The above applies to the Derivative Work as incorporated in a
606+ Collective Work, but this does not require the Collective Work
607+ apart from the Derivative Work itself to be made subject to the
608 terms of this License.
609- 3. If you distribute, publicly display, publicly perform, or
610- publicly digitally perform the Work or any Derivative Works or
611- Collective Works, You must keep intact all copyright notices for
612- the Work and provide, reasonable to the medium or means You are
613- utilizing: (i) the name of the Original Author (or pseudonym, if
614- applicable) if supplied, and/or (ii) if the Original Author and/or
615- Licensor designate another party or parties (e.g. a sponsor
616+ 3. If you distribute, publicly display, publicly perform, or
617+ publicly digitally perform the Work or any Derivative Works or
618+ Collective Works, You must keep intact all copyright notices for
619+ the Work and provide, reasonable to the medium or means You are
620+ utilizing: (i) the name of the Original Author (or pseudonym, if
621+ applicable) if supplied, and/or (ii) if the Original Author and/or
622+ Licensor designate another party or parties (e.g. a sponsor
623 institute, publishing entity, journal) for attribution in Licensor's
624 copyright notice, terms of service or by other reasonable means, the
625 name of such party or parties; the title of the Work if supplied; to
626- the extent reasonably practicable, the Uniform Resource Identifier,
627- if any, that Licensor specifies to be associated with the Work,
628- unless such URI does not refer to the copyright notice or licensing
629- information for the Work; and in the case of a Derivative Work, a
630+ the extent reasonably practicable, the Uniform Resource Identifier,
631+ if any, that Licensor specifies to be associated with the Work,
632+ unless such URI does not refer to the copyright notice or licensing
633+ information for the Work; and in the case of a Derivative Work, a
634 credit identifying the use of the Work in the Derivative Work (e.g.,
635- "French translation of the Work by Original Author," or "Screenplay
636- based on original Work by Original Author"). Such credit may be
637+ "French translation of the Work by Original Author," or "Screenplay
638+ based on original Work by Original Author"). Such credit may be
639 implemented in any reasonable manner; provided, however, that in the
640- case of a Derivative Work or Collective Work, at a minimum such
641- credit will appear where any other comparable authorship credit
642- appears and in a manner at least as prominent as such other
643+ case of a Derivative Work or Collective Work, at a minimum such
644+ credit will appear where any other comparable authorship credit
645+ appears and in a manner at least as prominent as such other
646 comparable authorship credit.
647- .
648+ .
649 5. Representations, Warranties and Disclaimer
650- .
651- UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
652- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
653- CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
654- INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
655- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
656- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
657- ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
658- THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
659+ .
660+ UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
661+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
662+ CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
663+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
664+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
665+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
666+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
667+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
668 TO YOU.
669- .
670- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
671- LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
672- ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
673- ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
674+ .
675+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
676+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
677+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
678+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
679 HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
680- .
681+ .
682 7. Termination
683- .
684- 1. This License and the rights granted hereunder will terminate
685- automatically upon any breach by You of the terms of this License.
686- Individuals or entities who have received Derivative Works or
687- Collective Works from You under this License, however, will not have
688- their licenses terminated provided such individuals or entities
689- remain in full compliance with those licenses. Sections 1, 2, 5, 6,
690+ .
691+ 1. This License and the rights granted hereunder will terminate
692+ automatically upon any breach by You of the terms of this License.
693+ Individuals or entities who have received Derivative Works or
694+ Collective Works from You under this License, however, will not have
695+ their licenses terminated provided such individuals or entities
696+ remain in full compliance with those licenses. Sections 1, 2, 5, 6,
697 7, and 8 will survive any termination of this License.
698- 2. Subject to the above terms and conditions, the license granted
699- here is perpetual (for the duration of the applicable copyright in
700- the Work). Notwithstanding the above, Licensor reserves the right to
701- release the Work under different license terms or to stop
702- distributing the Work at any time; provided, however that any such
703- election will not serve to withdraw this License (or any other
704- license that has been, or is required to be, granted under the terms
705- of this License), and this License will continue in full force and
706+ 2. Subject to the above terms and conditions, the license granted
707+ here is perpetual (for the duration of the applicable copyright in
708+ the Work). Notwithstanding the above, Licensor reserves the right to
709+ release the Work under different license terms or to stop
710+ distributing the Work at any time; provided, however that any such
711+ election will not serve to withdraw this License (or any other
712+ license that has been, or is required to be, granted under the terms
713+ of this License), and this License will continue in full force and
714 effect unless terminated as stated above.
715- .
716+ .
717 8. Miscellaneous
718- .
719- 1. Each time You distribute or publicly digitally perform the Work
720- or a Collective Work, the Licensor offers to the recipient a license
721- to the Work on the same terms and conditions as the license granted
722+ .
723+ 1. Each time You distribute or publicly digitally perform the Work
724+ or a Collective Work, the Licensor offers to the recipient a license
725+ to the Work on the same terms and conditions as the license granted
726 to You under this License.
727- 2. Each time You distribute or publicly digitally perform a
728- Derivative Work, Licensor offers to the recipient a license to the
729- original Work on the same terms and conditions as the license
730+ 2. Each time You distribute or publicly digitally perform a
731+ Derivative Work, Licensor offers to the recipient a license to the
732+ original Work on the same terms and conditions as the license
733 granted to You under this License.
734 3. If any provision of this License is invalid or unenforceable under
735 applicable law, it shall not affect the validity or enforceability of
736- the remainder of the terms of this License, and without further
737- action by the parties to this agreement, such provision shall be
738- reformed to the minimum extent necessary to make such provision
739+ the remainder of the terms of this License, and without further
740+ action by the parties to this agreement, such provision shall be
741+ reformed to the minimum extent necessary to make such provision
742 valid and enforceable.
743- 4. No term or provision of this License shall be deemed waived and
744- no breach consented to unless such waiver or consent shall be in
745- writing and signed by the party to be charged with such waiver or
746+ 4. No term or provision of this License shall be deemed waived and
747+ no breach consented to unless such waiver or consent shall be in
748+ writing and signed by the party to be charged with such waiver or
749 consent.
750- 5. This License constitutes the entire agreement between the parties
751- with respect to the Work licensed here. There are no understandings,
752- agreements or representations with respect to the Work not specified
753- here. Licensor shall not be bound by any additional provisions that
754- may appear in any communication from You. This License may not be
755- modified without the mutual written agreement of the Licensor and
756+ 5. This License constitutes the entire agreement between the parties
757+ with respect to the Work licensed here. There are no understandings,
758+ agreements or representations with respect to the Work not specified
759+ here. Licensor shall not be bound by any additional provisions that
760+ may appear in any communication from You. This License may not be
761+ modified without the mutual written agreement of the Licensor and
762 You.
763- .
764- Creative Commons is not a party to this License, and makes no warranty
765- whatsoever in connection with the Work. Creative Commons will not be
766- liable to You or any party on any legal theory for any damages
767- whatsoever, including without limitation any general, special,
768- incidental or consequential damages arising in connection to this
769- license. Notwithstanding the foregoing two (2) sentences, if Creative
770- Commons has expressly identified itself as the Licensor hereunder,
771+ .
772+ Creative Commons is not a party to this License, and makes no warranty
773+ whatsoever in connection with the Work. Creative Commons will not be
774+ liable to You or any party on any legal theory for any damages
775+ whatsoever, including without limitation any general, special,
776+ incidental or consequential damages arising in connection to this
777+ license. Notwithstanding the foregoing two (2) sentences, if Creative
778+ Commons has expressly identified itself as the Licensor hereunder,
779 it shall have all rights and obligations of Licensor.
780- .
781- Except for the limited purpose of indicating to the public that the
782- Work is licensed under the CCPL, neither party will use the trademark
783- "Creative Commons" or any related trademark or logo of Creative Commons
784- without the prior written consent of Creative Commons. Any permitted
785- use will be in compliance with Creative Commons' then-current trademark
786- usage guidelines, as may be published on its website or otherwise made
787+ .
788+ Except for the limited purpose of indicating to the public that the
789+ Work is licensed under the CCPL, neither party will use the trademark
790+ "Creative Commons" or any related trademark or logo of Creative Commons
791+ without the prior written consent of Creative Commons. Any permitted
792+ use will be in compliance with Creative Commons' then-current trademark
793+ usage guidelines, as may be published on its website or otherwise made
794 available upon request from time to time.
795- .
796+ .
797 Creative Commons may be contacted at http://creativecommons.org/
798
799 License: LGPL-3.0
800
801=== modified file 'debian/libubuntugestures5-gles-dev.install'
802--- debian/libubuntugestures5-gles-dev.install 2015-12-16 09:59:02 +0000
803+++ debian/libubuntugestures5-gles-dev.install 2016-04-04 04:43:28 +0000
804@@ -1,28 +1,27 @@
805-usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
806-usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
807-usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
808-usr/include/*/qt5/UbuntuGestures/UbuntuGestures
809-usr/include/*/qt5/UbuntuGestures/pool.h
810-usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
811-usr/include/*/qt5/UbuntuGestures/DebugHelpers
812-usr/include/*/qt5/UbuntuGestures/debughelpers.h
813-usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
814-usr/include/*/qt5/UbuntuGestures/touchregistry.h
815-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
816-usr/include/*/qt5/UbuntuGestures/timesource.h
817-usr/include/*/qt5/UbuntuGestures/TimeSource
818-usr/include/*/qt5/UbuntuGestures/timer.h
819-usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
820-usr/include/*/qt5/UbuntuGestures/TouchRegistry
821-usr/include/*/qt5/UbuntuGestures/Pool
822-usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
823-usr/include/*/qt5/UbuntuGestures/Timer
824-usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
825-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
826+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
827+usr/include/*/qt5/UbuntuGestures/DebugHelpers
828+usr/include/*/qt5/UbuntuGestures/Pool
829+usr/include/*/qt5/UbuntuGestures/TimeSource
830+usr/include/*/qt5/UbuntuGestures/Timer
831+usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
832+usr/include/*/qt5/UbuntuGestures/TouchRegistry
833+usr/include/*/qt5/UbuntuGestures/UbuntuGestures
834+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
835+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
836+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
837+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
838+usr/include/*/qt5/UbuntuGestures/debughelpers.h
839+usr/include/*/qt5/UbuntuGestures/pool.h
840+usr/include/*/qt5/UbuntuGestures/timer.h
841+usr/include/*/qt5/UbuntuGestures/timesource.h
842+usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
843+usr/include/*/qt5/UbuntuGestures/touchregistry.h
844+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
845+usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
846+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
847+usr/lib/*/libUbuntuGestures.la
848 usr/lib/*/libUbuntuGestures.prl
849-usr/lib/*/libUbuntuGestures.la
850 usr/lib/*/libUbuntuGestures.so
851 usr/lib/*/pkgconfig/UbuntuGestures.pc
852 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri
853 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures_private.pri
854-
855
856=== modified file 'debian/libubuntutoolkit5-gles-dev.install'
857--- debian/libubuntutoolkit5-gles-dev.install 2016-02-05 15:04:58 +0000
858+++ debian/libubuntutoolkit5-gles-dev.install 2016-04-04 04:43:28 +0000
859@@ -5,8 +5,8 @@
860 usr/include/*/qt5/UbuntuToolkit/colorutils.h
861 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
862 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
863+usr/lib/*/libUbuntuToolkit.la
864 usr/lib/*/libUbuntuToolkit.prl
865-usr/lib/*/libUbuntuToolkit.la
866 usr/lib/*/libUbuntuToolkit.so
867 usr/lib/*/pkgconfig/UbuntuToolkit.pc
868 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri
869
870=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.install' => 'debian/qml-module-ubuntu-components-gles.install'
871--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.install 2016-01-06 04:21:47 +0000
872+++ debian/qml-module-ubuntu-components-gles.install 2016-04-04 04:43:28 +0000
873@@ -1,33 +1,33 @@
874-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
875-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
876-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
877-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
878-usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
879-usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
880-usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
881 usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml
882 usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml
883+usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
884 usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.qml
885-usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
886+usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
887 usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.qml
888-usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
889-usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
890-usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
891-usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
892-usr/lib/*/qt5/qml/Ubuntu/Components/artwork
893 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.2/*.qml
894 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.3/*.qml
895 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/qmldir
896-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
897-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
898-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
899-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
900-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
901 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.2/*.qml
902 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.3/*.qml
903 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
904+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
905+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
906+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
907+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
908+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
909 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
910 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
911 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
912+usr/lib/*/qt5/qml/Ubuntu/Components/artwork
913+usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
914+usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
915+usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
916+usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
917+usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
918+usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
919+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
920+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
921+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
922+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
923 usr/lib/*/qt5/qml/Ubuntu/Test
924 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo
925
926=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.lintian-overrides' => 'debian/qml-module-ubuntu-components-gles.lintian-overrides'
927--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.lintian-overrides 2014-07-15 17:00:58 +0000
928+++ debian/qml-module-ubuntu-components-gles.lintian-overrides 2016-04-04 04:43:28 +0000
929@@ -1,1 +1,1 @@
930-qtdeclarative5-ubuntu-ui-toolkit-plugin: image-file-in-usr-lib
931+qml-module-ubuntu-components: image-file-in-usr-lib
932
933=== added file 'debian/qml-module-ubuntu-performancemetrics-gles.install'
934--- debian/qml-module-ubuntu-performancemetrics-gles.install 1970-01-01 00:00:00 +0000
935+++ debian/qml-module-ubuntu-performancemetrics-gles.install 2016-04-04 04:43:28 +0000
936@@ -0,0 +1,4 @@
937+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
938+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
939+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
940+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
941
942=== modified file 'debian/rules'
943--- debian/rules 2015-12-08 08:55:17 +0000
944+++ debian/rules 2016-04-04 04:43:28 +0000
945@@ -5,6 +5,7 @@
946
947 # Uncomment this to turn on verbose mode.
948 # export DH_VERBOSE=1
949+export QT_SELECT := qt5
950 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
951 export QMAKEFEATURES=$(CURDIR)/features
952 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)

Subscribers

People subscribed via source and target branches