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

[Zoltan Balogh]

OTA10 landing 2016-03-10 gles

OTA10 landing 2016-03-10 gles

[lp:~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-03-10-gles]

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

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-30 23:08:56 +0000
+++ debian/changelog	2016-04-04 04:43:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit-gles (1.3.1872+16.04.20160330.2-0ubuntu1) xenial; urgency=medium
 
   [ Zoltán Balogh ]
@@ -7,6 +8,15 @@
 
  -- Zoltan Balogh <[e-mail]>  Wed, 30 Mar 2016 23:08:55 +0000
 
+=======
+ubuntu-ui-toolkit-gles (1.3.1918+16.04-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zoltán Balogh ]
+  * Sync with the main package 1.3.1918+16.04-0ubuntu1
+
+ -- Zoltán Balogh <[e-mail]>  Thu, 10 Mar 2016 07:55:20 +0200
+
+>>>>>>> MERGE-SOURCE
 ubuntu-ui-toolkit-gles (1.3.1872+16.04.20160314-0ubuntu1) xenial; urgency=medium
 
   [ Zoltán Balogh ]

=== modified file 'debian/control'
--- debian/control	2016-02-17 13:04:22 +0000
+++ debian/control	2016-04-04 04:43:28 +0000
@@ -2,136 +2,194 @@
 Priority: optional
 Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
+Build-Depends: accountsservice,
+               dbus,
+               dbus-test-runner,
+               debhelper (>= 9.0.0),
                devscripts,
+               gdb,
+               language-pack-en-base,
+               libdbus-1-dev,
+               libfontconfig1-dev,
+               libfreetype6-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
+               libinput-dev,
+               liblttng-ust-dev,
+               libmtdev-dev,
+               libnih-dbus-dev,
+               libqt5gui5-gles,
+               libqt5organizer5,
+               libqt5quick5-gles,
+               libqt5quickparticles5-gles,
+               libqt5quickwidgets5-gles,
+               libqt5sql5-sqlite,
+               libqt5svg5-dev,
+               libudev-dev,
+               libxkbcommon-dev,
+               libxrender-dev,
+               locales,
+               python-autopilot (>= 1.4),
+               python3-sphinx,
                python3:any,
                python:any,
-               qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
-               libinput-dev,
-               libxkbcommon-dev,
+               qml-module-qt-labs-settings,
+               qml-module-qtgraphicaleffects,
+               qml-module-qtqml-models2,
+               qml-module-qtquick-layouts,
+               qml-module-qtquick-localstorage,
+               qml-module-qtquick-window2,
+               qml-module-qtquick2,
+               qml-module-qttest,
+               qtbase5-dev-tools,
                qtbase5-gles-dev,
-               qtbase5-dev-tools,
-               libqt5organizer5,
-               qt5-default,
                qtbase5-private-gles-dev,
-               libqt5sql5-sqlite,
                qtdeclarative5-dev-tools,
+               qtdeclarative5-doc-html,
                qtdeclarative5-private-dev,
-               qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
-               qml-module-qttest | qtdeclarative5-test-plugin,
-               qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
-               qml-module-qt-labs-settings | qtdeclarative5-settings-plugin,
-               qml-module-qtquick-layouts,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
-               qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
-               qml-module-qtqml-models2,
-               qtdeclarative5-doc-html,
-               qtwebkit5-doc-html,
-               qtsvg5-doc-html,
-               libqt5svg5-dev,
-               qtscript5-doc-html,
                qtmultimedia5-doc-html,
-               unity-action-doc,
-               devscripts,
                qtpim5-dev,
-               language-pack-en-base,
-               libdbus-1-dev,
-               libnih-dbus-dev,
-               dbus,
-               dbus-test-runner,
-               accountsservice,
-               xvfb,
-               gdb,
-               locales,
+               qtscript5-doc-html,
+               qtsvg5-doc-html,
+               qtwebkit5-doc-html,
                suru-icon-theme,
+               unity-action-doc,
                uuid-runtime,
-               python-autopilot (>= 1.4),
-               python3-sphinx,
-               libfontconfig1-dev,
-               libfreetype6-dev,
-               libmtdev-dev,
-               libudev-dev,
-               libxrender-dev,
-               libqt5gui5-gles,
-               libqt5quick5-gles,
-               libqt5quickparticles5-gles,
-               libqt5quickwidgets5-gles,
-               liblttng-ust-dev,
-Standards-Version: 3.9.4
+               xvfb,
+Standards-Version: 3.9.7
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 
 Package: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles
-Architecture: i386 amd64
-Conflicts: qtdeclarative5-ubuntu-ui-toolkit-plugin
-Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin
-Provides: qtdeclarative5-ubuntu-ui-toolkit-plugin
-Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: libqt5qml-graphicaleffects | libqt5graphicaleffects5,
-         libqt5svg5,
-         qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
-         qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+Section: oldlibs
+Architecture: amd64 i386
+Multi-Arch: same
+Depends: qml-module-ubuntu-components-gles,
+         ${misc:Depends},
+Description: Transitional package for Qt Components for Ubuntu, OpenGLES
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This is a transitional package that is safe to remove.
+ .
+ This is the OpenGL ES version for amd64 and i386.
+
+Package: qml-module-ubuntu-components-gles
+Architecture: amd64 i386
+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+Conflicts: qml-module-ubuntu-components,
+           qtdeclarative5-ubuntu-ui-toolkit-plugin,
+Replaces: qml-module-ubuntu-components,
+          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+          qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+Provides: qml-module-ubuntu-components,
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: libqt5svg5,
+         libubuntugestures5-gles (= ${binary:Version}),
+         libubuntutoolkit5-gles (= ${binary:Version}),
+         qml-module-qtfeedback,
+         qml-module-qtgraphicaleffects,
          qml-module-qtquick-layouts,
-         qtdeclarative5-qtfeedback-plugin,
+         qml-module-qtquick-window2,
+         qml-module-qtquick2,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme,
-         libubuntugestures5-gles (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt Components for Ubuntu - QML plugin - OpenGLES
+Description: Qt Components for Ubuntu - QML plugin - GLES
  Qt Components for Ubuntu offers a set of reusable user interface
  components for Qt Quick 2 / QML.
  .
  This package contains the Ubuntu Components QML plugin (built with
  the OpenGLES backend).
 
+Package: qml-module-ubuntu-performancemetrics-gles
+Architecture: amd64 i386
+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+Conflicts: qml-module-ubuntu-performancemetrics,
+Replaces: qml-module-ubuntu-performancemetrics,
+          qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (<< ${source:Version}),
+Provides: qml-module-ubuntu-performancemetrics,
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt Components for Ubuntu - PerformanceMetrics QML plugin - GLES
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu PerformanceMetrics QML plugin.
+ .
+ This is the OpenGL ES version for amd64 and i386.
+
 Package: libubuntugestures5-gles
-Architecture: i386 amd64
-Conflicts: libubuntugestures5
-Replaces: libubuntugestures5
-Provides: libubuntugestures5
+Architecture: amd64 i386
+Conflicts: libubuntugestures5,
+Replaces: libubuntugestures5,
+Provides: libubuntugestures5,
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Gestures library for Ubuntu UI Toolkit - OpenGLES
+Description: Gestures library for Ubuntu UI Toolkit - GLES
  Library supporting Gesture recognition for Ubuntu UI Toolkit
  Classes for SwipeArea, and for Ubuntu Gestures in general.
+ .
+ This is the OpenGL ES version for amd64 and i386.
 
 Package: libubuntugestures5-gles-dev
-Architecture: i386 amd64
-Conflicts: libubuntugestures5-dev
-Replaces: libubuntugestures5-dev
-Provides: libubuntugestures5-dev
+Architecture: amd64 i386
+Conflicts: libubuntugestures5-dev,
+Replaces: libubuntugestures5-dev,
+Provides: libubuntugestures5-dev,
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Ubuntu gestures library development files - OpenGLES
+Description: Ubuntu gestures library development files - GLES
  This package contains the development files for
  Ubuntu gestures library with SwipeArea
+ .
+ This is the OpenGL ES version for amd64 and i386.
 
 Package: libubuntutoolkit5-gles
-Architecture: i386 amd64
+Architecture: amd64 i386
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Conflicts: libubuntutoolkit5,
+Replaces: libubuntutoolkit5,
+Provides: libubuntutoolkit5,
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Ubuntu toolkit common library for Ubuntu UI Toolkit
+Description: Ubuntu toolkit common library for Ubuntu UI Toolkit - GLES
  Contains components and helper classes that are shared between the
  Ubuntu QML plugins
+ .
+ This is the OpenGL ES version for amd64 and i386.
 
 Package: libubuntutoolkit5-gles-dev
-Architecture: i386 amd64
+Architecture: amd64 i386
 Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Section: libdevel
+Conflicts: libubuntutoolkit5-dev,
+Replaces: libubuntutoolkit5-dev,
+Provides: libubuntutoolkit5-dev,
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Ubuntu toolkit common library development files
+Description: Ubuntu toolkit common library development files - GLES
  This package contains the development files for
  Ubuntu toolkit common library
+ .
+ This is the OpenGL ES version for amd64 and i386.

=== modified file 'debian/copyright'
--- debian/copyright	2014-07-15 17:00:58 +0000
+++ debian/copyright	2016-04-04 04:43:28 +0000
@@ -2,13 +2,13 @@
 Upstream-Name: ubuntu-ui-toolkit
 Source: https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk
 
-Files: * 
+Files: *
 Copyright: 2012-2013 Canonical Ltd.
 License: LGPL-3.0
 
 Files: modules/Ubuntu/Components/Themes/Ambiance/artwork/*
-Files: modules/Ubuntu/Components/artwork/*
-Files: modules/Ubuntu/Components/ListItems/artwork/*
+       modules/Ubuntu/Components/artwork/*
+       modules/Ubuntu/Components/ListItems/artwork/*
 Copyright: 2004-2013, Canonical Ltd.
 License: CC-BY-SA-3.0
  Unless otherwise indicated, artwork is available under the Creative
@@ -17,273 +17,273 @@
  http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
  Creative Commons, 171 Second Street, Suite 300, San Francisco,
  California, 94105, USA. See below for the full text of the license.
- . 
- Some Rights Reserved: 
- . 
+ .
+ Some Rights Reserved:
+ .
  The rights in the trademarks, logos, service marks of Canonical Ltd,
  as well as the look and feel of Ubuntu, are not licensed under the
  Creative Commons license and are subject to the Canonical Trademark
  Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy
- . 
- License: 
- . 
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE 
- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN 
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS 
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES 
- REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR 
+ .
+ License:
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
  DAMAGES RESULTING FROM ITS USE.
- . 
+ .
  License
- . 
- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS 
- CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS 
- PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE 
- WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW 
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+ WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW
  IS PROHIBITED.
- . 
- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND 
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
  AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU
- THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH 
+ THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
  TERMS AND CONDITIONS.
- . 
+ .
  1. Definitions
- . 
-    1. "Collective Work" means a work, such as a periodical issue, 
-    anthology or encyclopedia, in which the Work in its entirety in 
-    unmodified form, along with a number of other contributions, 
-    constituting separate and independent works in themselves, are 
-    assembled into a collective whole. A work that constitutes a 
-    Collective Work will not be considered a Derivative Work 
+ .
+    1. "Collective Work" means a work, such as a periodical issue,
+    anthology or encyclopedia, in which the Work in its entirety in
+    unmodified form, along with a number of other contributions,
+    constituting separate and independent works in themselves, are
+    assembled into a collective whole. A work that constitutes a
+    Collective Work will not be considered a Derivative Work
     (as defined below) for the purposes of this License.
-    2. "Derivative Work" means a work based upon the Work or upon the 
-    Work and other pre-existing works, such as a translation, musical 
-    arrangement, dramatization, fictionalization, motion picture 
-    version, sound recording, art reproduction, abridgment, 
-    condensation, or any other form in which the Work may be recast, 
-    transformed, or adapted, except that a work that constitutes a 
-    Collective Work will not be considered a Derivative Work for the 
-    purpose of this License. For the avoidance of doubt, where the Work 
-    is a musical composition or sound recording, the synchronization of 
-    the Work in timed-relation with a moving image ("synching") will be 
+    2. "Derivative Work" means a work based upon the Work or upon the
+    Work and other pre-existing works, such as a translation, musical
+    arrangement, dramatization, fictionalization, motion picture
+    version, sound recording, art reproduction, abridgment,
+    condensation, or any other form in which the Work may be recast,
+    transformed, or adapted, except that a work that constitutes a
+    Collective Work will not be considered a Derivative Work for the
+    purpose of this License. For the avoidance of doubt, where the Work
+    is a musical composition or sound recording, the synchronization of
+    the Work in timed-relation with a moving image ("synching") will be
     considered a Derivative Work for the purpose of this License.
-    3. "Licensor" means the individual or entity that offers the Work 
+    3. "Licensor" means the individual or entity that offers the Work
     under the terms of this License.
-    4. "Original Author" means the individual or entity who created the 
+    4. "Original Author" means the individual or entity who created the
     Work.
-    5. "Work" means the copyrightable work of authorship offered under 
+    5. "Work" means the copyrightable work of authorship offered under
     the terms of this License.
-    6. "You" means an individual or entity exercising rights under this 
-    License who has not previously violated the terms of this License 
-    with respect to the Work, or who has received express permission 
-    from the Licensor to exercise rights under this License despite a 
+    6. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License
+    with respect to the Work, or who has received express permission
+    from the Licensor to exercise rights under this License despite a
     previous violation.
-    7. "License Elements" means the following high-level license 
-    attributes as selected by Licensor and indicated in the title of 
+    7. "License Elements" means the following high-level license
+    attributes as selected by Licensor and indicated in the title of
     this License: Attribution, ShareAlike.
- . 
- 2. Fair Use Rights. Nothing in this license is intended to reduce, 
- limit, or restrict any rights arising from fair use, first sale or 
- other limitations on the exclusive rights of the copyright owner under 
+ .
+ 2. Fair Use Rights. Nothing in this license is intended to reduce,
+ limit, or restrict any rights arising from fair use, first sale or
+ other limitations on the exclusive rights of the copyright owner under
  copyright law or other applicable laws.
- . 
- 3. License Grant. Subject to the terms and conditions of this License, 
- Licensor hereby grants You a worldwide, royalty-free, non-exclusive, 
- perpetual (for the duration of the applicable copyright) license to 
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
  exercise the rights in the Work as stated below:
- . 
-    1. to reproduce the Work, to incorporate the Work into one or more 
-    Collective Works, and to reproduce the Work as incorporated in the 
+ .
+    1. to reproduce the Work, to incorporate the Work into one or more
+    Collective Works, and to reproduce the Work as incorporated in the
     Collective Works;
     2. to create and reproduce Derivative Works;
-    3. to distribute copies or phonorecords of, display publicly, 
-    perform publicly, and perform publicly by means of a digital audio 
+    3. to distribute copies or phonorecords of, display publicly,
+    perform publicly, and perform publicly by means of a digital audio
     transmission the Work including as incorporated in Collective Works;
-    4. to distribute copies or phonorecords of, display publicly, 
-    perform publicly, and perform publicly by means of a digital audio 
+    4. to distribute copies or phonorecords of, display publicly,
+    perform publicly, and perform publicly by means of a digital audio
     transmission Derivative Works.
     5.
- . 
-       For the avoidance of doubt, where the work is a musical 
+ .
+       For the avoidance of doubt, where the work is a musical
        composition:
-          1. Performance Royalties Under Blanket Licenses. Licensor 
-          waives the exclusive right to collect, whether individually 
-          or via a performance rights society (e.g. ASCAP, BMI, SESAC), 
-          royalties for the public performance or public digital 
+          1. Performance Royalties Under Blanket Licenses. Licensor
+          waives the exclusive right to collect, whether individually
+          or via a performance rights society (e.g. ASCAP, BMI, SESAC),
+          royalties for the public performance or public digital
           performance (e.g. webcast) of the Work.
-          2. Mechanical Rights and Statutory Royalties. Licensor waives 
-          the exclusive right to collect, whether individually or via a 
-          music rights society or designated agent (e.g. Harry Fox 
-          Agency), royalties for any phonorecord You create from the 
-          Work ("cover version") and distribute, subject to the 
-          compulsory license created by 17 USC Section 115 of the US 
+          2. Mechanical Rights and Statutory Royalties. Licensor waives
+          the exclusive right to collect, whether individually or via a
+          music rights society or designated agent (e.g. Harry Fox
+          Agency), royalties for any phonorecord You create from the
+          Work ("cover version") and distribute, subject to the
+          compulsory license created by 17 USC Section 115 of the US
           Copyright Act (or the equivalent in other jurisdictions).
-    6. Webcasting Rights and Statutory Royalties. For the avoidance of 
-    doubt, where the Work is a sound recording, Licensor waives the 
-    exclusive right to collect, whether individually or via a 
-    performance-rights society (e.g. SoundExchange), royalties for the 
-    public digital performance (e.g. webcast) of the Work, subject to 
-    the compulsory license created by 17 USC Section 114 of the US 
+    6. Webcasting Rights and Statutory Royalties. For the avoidance of
+    doubt, where the Work is a sound recording, Licensor waives the
+    exclusive right to collect, whether individually or via a
+    performance-rights society (e.g. SoundExchange), royalties for the
+    public digital performance (e.g. webcast) of the Work, subject to
+    the compulsory license created by 17 USC Section 114 of the US
     Copyright Act (or the equivalent in other jurisdictions).
- . 
- The above rights may be exercised in all media and formats whether now 
- known or hereafter devised. The above rights include the right to make 
- such modifications as are technically necessary to exercise the rights 
- in other media and formats. All rights not expressly granted by 
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. All rights not expressly granted by
  Licensor are hereby reserved.
- . 
- 4. Restrictions.The license granted in Section 3 above is expressly 
+ .
+ 4. Restrictions.The license granted in Section 3 above is expressly
  made subject to and limited by the following restrictions:
- . 
-    1. You may distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Work only under the terms of this 
-    License, and You must include a copy of, or the Uniform Resource 
-    Identifier for, this License with every copy or phonorecord of the 
+ .
+    1. You may distribute, publicly display, publicly perform, or
+    publicly digitally perform the Work only under the terms of this
+    License, and You must include a copy of, or the Uniform Resource
+    Identifier for, this License with every copy or phonorecord of the
     Work You distribute, publicly display, publicly perform, or publicly
     digitally perform. You may not offer or impose any terms on the Work
-    that alter or restrict the terms of this License or the recipients' 
+    that alter or restrict the terms of this License or the recipients'
     exercise of the rights granted hereunder. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License 
-    and to the disclaimer of warranties. You may not distribute, 
-    publicly display, publicly perform, or publicly digitally perform 
+    Work. You must keep intact all notices that refer to this License
+    and to the disclaimer of warranties. You may not distribute,
+    publicly display, publicly perform, or publicly digitally perform
     the Work with any technological measures that control access or use
-    of the Work in a manner inconsistent with the terms of this License 
-    Agreement. The above applies to the Work as incorporated in a 
+    of the Work in a manner inconsistent with the terms of this License
+    Agreement. The above applies to the Work as incorporated in a
     Collective Work, but this does not require the Collective Work apart
-    from the Work itself to be made subject to the terms of this 
-    License. If You create a Collective Work, upon notice from any 
-    Licensor You must, to the extent practicable, remove from the 
+    from the Work itself to be made subject to the terms of this
+    License. If You create a Collective Work, upon notice from any
+    Licensor You must, to the extent practicable, remove from the
     Collective Work any credit as required by clause 4(c), as requested.
-    If You create a Derivative Work, upon notice from any Licensor You 
-    must, to the extent practicable, remove from the Derivative Work 
+    If You create a Derivative Work, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Derivative Work
     any credit as required by clause 4(c), as requested.
-    2. You may distribute, publicly display, publicly perform, or 
-    publicly digitally perform a Derivative Work only under the terms 
-    of this License, a later version of this License with the same 
-    License Elements as this License, or a Creative Commons iCommons 
-    license that contains the same License Elements as this License 
+    2. You may distribute, publicly display, publicly perform, or
+    publicly digitally perform a Derivative Work only under the terms
+    of this License, a later version of this License with the same
+    License Elements as this License, or a Creative Commons iCommons
+    license that contains the same License Elements as this License
     (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of,
-    or the Uniform Resource Identifier for, this License or other 
-    license specified in the previous sentence with every copy or 
-    phonorecord of each Derivative Work You distribute, publicly 
-    display, publicly perform, or publicly digitally perform. You may 
-    not offer or impose any terms on the Derivative Works that alter or 
-    restrict the terms of this License or the recipients' exercise of 
-    the rights granted hereunder, and You must keep intact all notices 
-    that refer to this License and to the disclaimer of warranties. 
-    You may not distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Derivative Work with any 
-    technological measures that control access or use of the Work in a 
-    manner inconsistent with the terms of this License Agreement. 
-    The above applies to the Derivative Work as incorporated in a 
-    Collective Work, but this does not require the Collective Work 
-    apart from the Derivative Work itself to be made subject to the 
+    or the Uniform Resource Identifier for, this License or other
+    license specified in the previous sentence with every copy or
+    phonorecord of each Derivative Work You distribute, publicly
+    display, publicly perform, or publicly digitally perform. You may
+    not offer or impose any terms on the Derivative Works that alter or
+    restrict the terms of this License or the recipients' exercise of
+    the rights granted hereunder, and You must keep intact all notices
+    that refer to this License and to the disclaimer of warranties.
+    You may not distribute, publicly display, publicly perform, or
+    publicly digitally perform the Derivative Work with any
+    technological measures that control access or use of the Work in a
+    manner inconsistent with the terms of this License Agreement.
+    The above applies to the Derivative Work as incorporated in a
+    Collective Work, but this does not require the Collective Work
+    apart from the Derivative Work itself to be made subject to the
     terms of this License.
-    3. If you distribute, publicly display, publicly perform, or 
-    publicly digitally perform the Work or any Derivative Works or 
-    Collective Works, You must keep intact all copyright notices for 
-    the Work and provide, reasonable to the medium or means You are 
-    utilizing: (i) the name of the Original Author (or pseudonym, if 
-    applicable) if supplied, and/or (ii) if the Original Author and/or 
-    Licensor designate another party or parties (e.g. a sponsor 
+    3. If you distribute, publicly display, publicly perform, or
+    publicly digitally perform the Work or any Derivative Works or
+    Collective Works, You must keep intact all copyright notices for
+    the Work and provide, reasonable to the medium or means You are
+    utilizing: (i) the name of the Original Author (or pseudonym, if
+    applicable) if supplied, and/or (ii) if the Original Author and/or
+    Licensor designate another party or parties (e.g. a sponsor
     institute, publishing entity, journal) for attribution in Licensor's
     copyright notice, terms of service or by other reasonable means, the
     name of such party or parties; the title of the Work if supplied; to
-    the extent reasonably practicable, the Uniform Resource Identifier, 
-    if any, that Licensor specifies to be associated with the Work, 
-    unless such URI does not refer to the copyright notice or licensing 
-    information for the Work; and in the case of a Derivative Work, a 
+    the extent reasonably practicable, the Uniform Resource Identifier,
+    if any, that Licensor specifies to be associated with the Work,
+    unless such URI does not refer to the copyright notice or licensing
+    information for the Work; and in the case of a Derivative Work, a
     credit identifying the use of the Work in the Derivative Work (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay 
-    based on original Work by Original Author"). Such credit may be 
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). Such credit may be
     implemented in any reasonable manner; provided, however, that in the
-    case of a Derivative Work or Collective Work, at a minimum such 
-    credit will appear where any other comparable authorship credit 
-    appears and in a manner at least as prominent as such other 
+    case of a Derivative Work or Collective Work, at a minimum such
+    credit will appear where any other comparable authorship credit
+    appears and in a manner at least as prominent as such other
     comparable authorship credit.
- . 
+ .
  5. Representations, Warranties and Disclaimer
- . 
- UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS 
- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND 
- CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, 
- INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, 
- FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF 
- LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF 
- ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW 
- THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY 
+ .
+ UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+ CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
  TO YOU.
- . 
- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE 
- LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR 
- ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES 
- ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR 
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- . 
+ .
  7. Termination
- . 
-    1. This License and the rights granted hereunder will terminate 
-    automatically upon any breach by You of the terms of this License. 
-    Individuals or entities who have received Derivative Works or 
-    Collective Works from You under this License, however, will not have 
-    their licenses terminated provided such individuals or entities 
-    remain in full compliance with those licenses. Sections 1, 2, 5, 6, 
+ .
+    1. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Derivative Works or
+    Collective Works from You under this License, however, will not have
+    their licenses terminated provided such individuals or entities
+    remain in full compliance with those licenses. Sections 1, 2, 5, 6,
     7, and 8 will survive any termination of this License.
-    2. Subject to the above terms and conditions, the license granted 
-    here is perpetual (for the duration of the applicable copyright in 
-    the Work). Notwithstanding the above, Licensor reserves the right to 
-    release the Work under different license terms or to stop 
-    distributing the Work at any time; provided, however that any such 
-    election will not serve to withdraw this License (or any other 
-    license that has been, or is required to be, granted under the terms 
-    of this License), and this License will continue in full force and 
+    2. Subject to the above terms and conditions, the license granted
+    here is perpetual (for the duration of the applicable copyright in
+    the Work). Notwithstanding the above, Licensor reserves the right to
+    release the Work under different license terms or to stop
+    distributing the Work at any time; provided, however that any such
+    election will not serve to withdraw this License (or any other
+    license that has been, or is required to be, granted under the terms
+    of this License), and this License will continue in full force and
     effect unless terminated as stated above.
- . 
+ .
  8. Miscellaneous
- . 
-    1. Each time You distribute or publicly digitally perform the Work 
-    or a Collective Work, the Licensor offers to the recipient a license 
-    to the Work on the same terms and conditions as the license granted 
+ .
+    1. Each time You distribute or publicly digitally perform the Work
+    or a Collective Work, the Licensor offers to the recipient a license
+    to the Work on the same terms and conditions as the license granted
     to You under this License.
-    2. Each time You distribute or publicly digitally perform a 
-    Derivative Work, Licensor offers to the recipient a license to the 
-    original Work on the same terms and conditions as the license 
+    2. Each time You distribute or publicly digitally perform a
+    Derivative Work, Licensor offers to the recipient a license to the
+    original Work on the same terms and conditions as the license
     granted to You under this License.
     3. If any provision of this License is invalid or unenforceable under
     applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further 
-    action by the parties to this agreement, such provision shall be 
-    reformed to the minimum extent necessary to make such provision 
+    the remainder of the terms of this License, and without further
+    action by the parties to this agreement, such provision shall be
+    reformed to the minimum extent necessary to make such provision
     valid and enforceable.
-    4. No term or provision of this License shall be deemed waived and 
-    no breach consented to unless such waiver or consent shall be in 
-    writing and signed by the party to be charged with such waiver or 
+    4. No term or provision of this License shall be deemed waived and
+    no breach consented to unless such waiver or consent shall be in
+    writing and signed by the party to be charged with such waiver or
     consent.
-    5. This License constitutes the entire agreement between the parties 
-    with respect to the Work licensed here. There are no understandings, 
-    agreements or representations with respect to the Work not specified 
-    here. Licensor shall not be bound by any additional provisions that 
-    may appear in any communication from You. This License may not be 
-    modified without the mutual written agreement of the Licensor and 
+    5. This License constitutes the entire agreement between the parties
+    with respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and
     You.
- . 
- Creative Commons is not a party to this License, and makes no warranty 
- whatsoever in connection with the Work. Creative Commons will not be 
- liable to You or any party on any legal theory for any damages 
- whatsoever, including without limitation any general, special, 
- incidental or consequential damages arising in connection to this 
- license. Notwithstanding the foregoing two (2) sentences, if Creative 
- Commons has expressly identified itself as the Licensor hereunder, 
+ .
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder,
  it shall have all rights and obligations of Licensor.
- . 
- Except for the limited purpose of indicating to the public that the 
- Work is licensed under the CCPL, neither party will use the trademark 
- "Creative Commons" or any related trademark or logo of Creative Commons 
- without the prior written consent of Creative Commons. Any permitted 
- use will be in compliance with Creative Commons' then-current trademark 
- usage guidelines, as may be published on its website or otherwise made 
+ .
+ Except for the limited purpose of indicating to the public that the
+ Work is licensed under the CCPL, neither party will use the trademark
+ "Creative Commons" or any related trademark or logo of Creative Commons
+ without the prior written consent of Creative Commons. Any permitted
+ use will be in compliance with Creative Commons' then-current trademark
+ usage guidelines, as may be published on its website or otherwise made
  available upon request from time to time.
- . 
+ .
  Creative Commons may be contacted at http://creativecommons.org/
 
 License: LGPL-3.0

=== modified file 'debian/libubuntugestures5-gles-dev.install'
--- debian/libubuntugestures5-gles-dev.install	2015-12-16 09:59:02 +0000
+++ debian/libubuntugestures5-gles-dev.install	2016-04-04 04:43:28 +0000
@@ -1,28 +1,27 @@
-usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h 
-usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer 
-usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent 
-usr/include/*/qt5/UbuntuGestures/UbuntuGestures 
-usr/include/*/qt5/UbuntuGestures/pool.h 
-usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h 
-usr/include/*/qt5/UbuntuGestures/DebugHelpers 
-usr/include/*/qt5/UbuntuGestures/debughelpers.h 
-usr/include/*/qt5/UbuntuGestures/touchownershipevent.h 
-usr/include/*/qt5/UbuntuGestures/touchregistry.h 
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends 
-usr/include/*/qt5/UbuntuGestures/timesource.h 
-usr/include/*/qt5/UbuntuGestures/TimeSource 
-usr/include/*/qt5/UbuntuGestures/timer.h 
-usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent 
-usr/include/*/qt5/UbuntuGestures/TouchRegistry 
-usr/include/*/qt5/UbuntuGestures/Pool 
-usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h 
-usr/include/*/qt5/UbuntuGestures/Timer 
-usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h 
-usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion 
+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
+usr/include/*/qt5/UbuntuGestures/DebugHelpers
+usr/include/*/qt5/UbuntuGestures/Pool
+usr/include/*/qt5/UbuntuGestures/TimeSource
+usr/include/*/qt5/UbuntuGestures/Timer
+usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
+usr/include/*/qt5/UbuntuGestures/TouchRegistry
+usr/include/*/qt5/UbuntuGestures/UbuntuGestures
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesDepends
+usr/include/*/qt5/UbuntuGestures/UbuntuGesturesVersion
+usr/include/*/qt5/UbuntuGestures/UnownedTouchEvent
+usr/include/*/qt5/UbuntuGestures/candidateinactivitytimer.h
+usr/include/*/qt5/UbuntuGestures/debughelpers.h
+usr/include/*/qt5/UbuntuGestures/pool.h
+usr/include/*/qt5/UbuntuGestures/timer.h
+usr/include/*/qt5/UbuntuGestures/timesource.h
+usr/include/*/qt5/UbuntuGestures/touchownershipevent.h
+usr/include/*/qt5/UbuntuGestures/touchregistry.h
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesglobal.h
+usr/include/*/qt5/UbuntuGestures/ubuntugesturesversion.h
+usr/include/*/qt5/UbuntuGestures/unownedtouchevent.h
+usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.prl
-usr/lib/*/libUbuntuGestures.la
 usr/lib/*/libUbuntuGestures.so
 usr/lib/*/pkgconfig/UbuntuGestures.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuGestures_private.pri
-

=== modified file 'debian/libubuntutoolkit5-gles-dev.install'
--- debian/libubuntutoolkit5-gles-dev.install	2016-02-05 15:04:58 +0000
+++ debian/libubuntutoolkit5-gles-dev.install	2016-04-04 04:43:28 +0000
@@ -5,8 +5,8 @@
 usr/include/*/qt5/UbuntuToolkit/colorutils.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitglobal.h
 usr/include/*/qt5/UbuntuToolkit/ubuntutoolkitversion.h
+usr/lib/*/libUbuntuToolkit.la
 usr/lib/*/libUbuntuToolkit.prl
-usr/lib/*/libUbuntuToolkit.la
 usr/lib/*/libUbuntuToolkit.so
 usr/lib/*/pkgconfig/UbuntuToolkit.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_UbuntuToolkit.pri

=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.install' => 'debian/qml-module-ubuntu-components-gles.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.install	2016-01-06 04:21:47 +0000
+++ debian/qml-module-ubuntu-components-gles.install	2016-04-04 04:43:28 +0000
@@ -1,33 +1,33 @@
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
-usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
 usr/lib/*/qt5/qml/Ubuntu/Components/1.0/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/1.1/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/1.3/*.js
-usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
-usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
-usr/lib/*/qt5/qml/Ubuntu/Components/artwork
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/ListItems/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
-usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Pickers/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.2/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/1.3/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
+usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
+usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Layouts/qmldir
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir
 usr/lib/*/qt5/qml/Ubuntu/Test
 usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo

=== renamed file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.lintian-overrides' => 'debian/qml-module-ubuntu-components-gles.lintian-overrides'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.lintian-overrides	2014-07-15 17:00:58 +0000
+++ debian/qml-module-ubuntu-components-gles.lintian-overrides	2016-04-04 04:43:28 +0000
@@ -1,1 +1,1 @@
-qtdeclarative5-ubuntu-ui-toolkit-plugin: image-file-in-usr-lib
+qml-module-ubuntu-components: image-file-in-usr-lib

=== added file 'debian/qml-module-ubuntu-performancemetrics-gles.install'
--- debian/qml-module-ubuntu-performancemetrics-gles.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-performancemetrics-gles.install	2016-04-04 04:43:28 +0000
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/*.qml
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/libUbuntuPerformanceMetrics.so
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/PerformanceMetrics/qmldir

=== modified file 'debian/rules'
--- debian/rules	2015-12-08 08:55:17 +0000
+++ debian/rules	2016-04-04 04:43:28 +0000
@@ -5,6 +5,7 @@
 
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
+export QT_SELECT := qt5
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export QMAKEFEATURES=$(CURDIR)/features
 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)