Merge lp:~unity-team/qtubuntu/gles-sync1 into lp:qtubuntu

[Gerry Boland]

Sync with upstream

Unmerged revisions

58. By CI Train Bot Account on 2016-01-28

Releasing 0.62+16.04.20160128.1-0ubuntu1

57. By Michał Sawicz on 2016-01-28

New upstream release

56. By CI Train Bot Account on 2016-01-11

Releasing 0.62+16.04.20160111-0ubuntu1

55. By Michał Sawicz on 2016-01-11

New release

54. By CI Train Bot Account on 2016-01-04

Releasing 0.62+16.04.20160104-0ubuntu1

53. By Michał Sawicz on 2016-01-04

New upstream release

52. By CI Train Bot Account on 2015-12-07

Releasing 0.62+16.04.20151207-0ubuntu1

51. By Michał Sawicz on 2015-12-07

Bring debian/control in line with upstream

50. By Timo Jyrinki on 2015-12-01

Rebuild against Qt 5.5.1.

49. By CI Train Bot Account on 2015-11-24

Releasing 0.62+16.04.20151124-0ubuntu1

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2016-02-03 00:32:40 +0000
@@ -0,0 +1,281 @@
+qtubuntu-gles (0.62+16.04.20160128.1-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release
+
+ -- Michał Sawicz <[e-mail]>  Thu, 28 Jan 2016 18:30:17 +0000
+
+qtubuntu-gles (0.62+16.04.20160111-0ubuntu1) xenial; urgency=medium
+
+  * New release
+
+ -- Michał Sawicz <[e-mail]>  Mon, 11 Jan 2016 11:27:41 +0000
+
+qtubuntu-gles (0.62+16.04.20160104-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release
+
+ -- Michał Sawicz <[e-mail]>  Mon, 04 Jan 2016 09:38:42 +0000
+
+qtubuntu-gles (0.62+16.04.20151207-0ubuntu1) xenial; urgency=medium
+
+  [ Michał Sawicz ]
+  * Bring debian/control in line with upstream
+
+ -- Gerry Boland <[e-mail]>  Mon, 07 Dec 2015 16:21:10 +0000
+
+qtubuntu-gles (0.62+16.04.20151124-0ubuntu2) xenial; urgency=medium
+
+  * Rebuild against Qt 5.5.1.
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 30 Nov 2015 16:16:38 +0200
+
+qtubuntu-gles (0.62+16.04.20151124-0ubuntu1) xenial; urgency=medium
+
+  * New release
+
+ -- Michał Sawicz <[e-mail]>  Tue, 24 Nov 2015 13:26:16 +0000
+
+qtubuntu-gles (0.62+16.04.20151117-0ubuntu1) xenial; urgency=medium
+
+  * Sync with upstream
+
+ -- Gerry Boland <[e-mail]>  Tue, 17 Nov 2015 14:49:42 +0000
+
+qtubuntu-gles (0.62+16.04.20151109-0ubuntu1) xenial; urgency=medium
+
+  * Sync with trunk
+
+ -- Gerry Boland <[e-mail]>  Mon, 09 Nov 2015 22:43:30 +0000
+
+qtubuntu-gles (0.62+16.04.20151105-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release
+
+ -- Michał Sawicz <[e-mail]>  Thu, 05 Nov 2015 16:57:00 +0000
+
+qtubuntu-gles (0.62+15.10.20151021-0ubuntu1) wily; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Michał Sawicz ]
+  * Sync with upstream
+
+  [ Robert Bruce Park ]
+  * Sync with upstream
+
+ -- Michał Sawicz <[e-mail]>  Wed, 21 Oct 2015 11:48:04 +0000
+
+qtubuntu-gles (0.62+15.10.20150914-0ubuntu1) wily; urgency=medium
+
+  [ Gerry Boland ]
+  * Sync with upstream
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- Gerry Boland <[e-mail]>  Tue, 15 Sep 2015 12:08:35 +0000
+
+qtubuntu-gles (0.62+15.04.20150828-0ubuntu2) vivid; urgency=medium
+
+  [ Michael Zanetti ]
+  * sync with upstream
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- CI Train Bot <[e-mail]>  Fri, 28 Aug 2015 08:43:25 +0000
+
+qtubuntu-gles (0.62+15.04.20150814-0ubuntu1) vivid; urgency=medium
+
+  [ Michael Zanetti ]
+  * Sync with upstream
+
+ -- CI Train Bot <[e-mail]>  Fri, 14 Aug 2015 13:39:08 +0000
+
+qtubuntu-gles (0.61+15.10.20150722-0ubuntu2) wily; urgency=medium
+
+  * No-change rebuild to pick up qtbase change.
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 14 Aug 2015 09:37:21 +0300
+
+qtubuntu-gles (0.61+15.10.20150722-0ubuntu1) wily; urgency=medium
+
+  [ Andreas Pokorny ]
+  * Sync with upstream
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- CI Train Bot <[e-mail]>  Wed, 22 Jul 2015 14:49:42 +0000
+
+qtubuntu-gles (0.61+15.10.20150706-0ubuntu1) wily; urgency=medium
+
+  [ Alberto Aguirre ]
+  * Sync with upstream
+
+ -- CI Train Bot <[e-mail]>  Tue, 07 Jul 2015 00:54:51 +0000
+
+qtubuntu-gles (0.61+15.10.20150617-0ubuntu1) wily; urgency=medium
+
+  [ Gerry Boland ]
+  * Sync with upstream
+
+ -- CI Train Bot <[e-mail]>  Wed, 17 Jun 2015 17:26:44 +0000
+
+qtubuntu-gles (0.61+15.10.20150611-0ubuntu2) wily; urgency=medium
+
+  * No-change rebuild against Qt 5.4.2.
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 15 Jun 2015 13:07:42 +0300
+
+qtubuntu-gles (0.61+15.10.20150611-0ubuntu1) wily; urgency=medium
+
+  [ Michael Zanetti ]
+  * Rebuild for shellRotation
+
+ -- CI Train Bot <[e-mail]>  Thu, 11 Jun 2015 11:40:33 +0000
+
+qtubuntu-gles (0.60+15.10.20150528-0ubuntu1) wily; urgency=medium
+
+  [ Alan Griffiths ]
+  * 
+
+ -- CI Train Bot <[e-mail]>  Thu, 28 May 2015 09:08:16 +0000
+
+qtubuntu-gles (0.60+15.04.20150318-0ubuntu5) vivid; urgency=medium
+
+  * No-change rebuild against latest platform-api
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 19 Mar 2015 22:38:01 -0300
+
+qtubuntu-gles (0.60+15.04.20150318-0ubuntu4) vivid; urgency=medium
+
+  * No-change rebuild to correct platform-api dependency
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 19 Mar 2015 11:54:32 +0200
+
+qtubuntu-gles (0.60+15.04.20150318-0ubuntu3) vivid; urgency=medium
+
+  [ Michał Sawicz ]
+  * Sync with upstream
+  * wrap-and-sort
+
+ -- CI Train Bot <[e-mail]>  Wed, 18 Mar 2015 12:23:29 +0000
+
+qtubuntu-gles (0.60+15.04.20141212-0ubuntu3) vivid; urgency=medium
+
+  * No-change rebuild against Qt 5.4.1.
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 12 Mar 2015 09:12:30 +0200
+
+qtubuntu-gles (0.60+15.04.20141212-0ubuntu2) vivid; urgency=medium
+
+  * No-change rebuild against Qt 5.4.0.
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 06 Feb 2015 14:48:47 +0200
+
+qtubuntu-gles (0.60+15.04.20141212-0ubuntu1) vivid; urgency=medium
+
+  [ Gerry Boland ]
+  * Sync with upstream
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 15 Dec 2014 11:45:45 +0000
+
+qtubuntu-gles (0.60+15.04.20141111-0ubuntu1) vivid; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Sync with upstream for Qt 5.3.2 rebuild
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 11 Nov 2014 08:08:45 +0000
+
+qtubuntu-gles (0.60+14.10.20141001-0ubuntu1) utopic; urgency=medium
+
+  [ Michael Zanetti ]
+  * Sync with upstream
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 01 Oct 2014 17:50:35 +0000
+
+qtubuntu-gles (0.60+14.10.20140815.1-0ubuntu1) utopic; urgency=medium
+
+  [ Gerry Boland ]
+  * Sync with qtubuntu
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 15 Aug 2014 17:09:39 +0000
+
+qtubuntu-gles (0.60+14.10.20140812-0ubuntu1) utopic; urgency=medium
+
+  [ Ricardo Mendoza ]
+  * Sync package with qtubuntu - 0.60+14.10.20140812-0ubuntu1
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 12 Aug 2014 19:37:55 +0000
+
+qtubuntu-gles (0.60+14.10.20140808.1-0ubuntu1) utopic; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Sync with upstream.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 08 Aug 2014 14:48:17 +0000
+
+qtubuntu-gles (0.60+14.10.20140806-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Sync package with qtubuntu - 0.60+14.10.20140806-0ubuntu1
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Wed, 06 Aug 2014 14:55:46 -0300
+
+qtubuntu-gles (0.60+14.10.20140728-0ubuntu1) utopic; urgency=medium
+
+  [ Gerry Boland ]
+  * Major refactor: remove SurfaceFlinger & Mir in-server-process-client
+    support, flatten class hierarchy. Only Mir client QPA remains
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Ricardo Salveti de Araujo ]
+  * debian/watch: changing to a silo that doesn't exist, so it can be
+    used as reference
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 28 Jul 2014 04:23:23 +0000
+
+qtubuntu-gles (0.54+14.10.20140613-0ubuntu2) utopic; urgency=medium
+
+  * debian/control: should depend on libqt5quickwidgets5-gles instead
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 19 Jun 2014 03:28:47 -0300
+
+qtubuntu-gles (0.54+14.10.20140613-0ubuntu1) utopic; urgency=medium
+
+  * Sync package with qtubuntu - 0.54+14.10.20140613-0ubuntu1 
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 18 Jun 2014 11:36:05 +0000
+
+qtubuntu-gles (0.54+14.10.20140612-0ubuntu1) utopic; urgency=low
+
+  [ Ricardo Mendoza ]
+  * Migrate to Platform API v2
+
+ -- Robert Bruce Park <[e-mail]>  Thu, 12 Jun 2014 13:51:37 -0700
+
+qtubuntu-gles (0.54+14.10.20140526.1-0ubuntu1) utopic; urgency=medium
+
+  * Sync package with qtubuntu - 0.54+14.10.20140526.1
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 05 Jun 2014 00:28:32 +0200
+
+qtubuntu-gles (0.54+14.10.20140430.1-0ubuntu2) utopic; urgency=medium
+
+  * debian/control: not renamining the binary package as qtubuntu-android is
+    not generated for all arches anymore
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 08 May 2014 19:53:01 -0300
+
+qtubuntu-gles (0.54+14.10.20140430.1-0ubuntu1) utopic; urgency=medium
+
+  * Repackging for building gles variants for i386 and amd64.
+    - Based on qtubuntu 0.54+14.10.20140430.1-0ubuntu1
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Wed, 07 May 2014 11:16:41 -0300

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2016-02-03 00:32:40 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2016-02-03 00:32:40 +0000
@@ -0,0 +1,51 @@
+Source: qtubuntu-gles
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               libatspi2.0-dev,
+               libegl1-mesa-dev,
+               libfontconfig1-dev,
+               libfreetype6-dev,
+               libgles2-mesa-dev,
+               libglib2.0-dev,
+               libinput-dev,
+               libmirclient-dev (>= 0.13.0),
+               libmtdev-dev,
+               libqt5gui5-gles,
+               libqt5quick5-gles,
+               libqt5quickparticles5-gles,
+               libqt5quicktest5,
+               libqt5quickwidgets5-gles,
+               libqt5sensors5-dev,
+               libubuntu-application-api-dev (>= 2.9.0),
+               libudev-dev,
+               libxkbcommon-dev,
+               libxrender-dev,
+               qt5-default,
+               qtbase5-gles-dev,
+               qtbase5-private-gles-dev,
+               qtdeclarative5-dev,
+Standards-Version: 3.9.4
+Section: libs
+
+Package: qtubuntu-android
+Architecture: amd64 i386
+Multi-Arch: same
+Conflicts: qtubuntu-android,
+           qtubuntu-desktop,
+Replaces: qtubuntu-android,
+Provides: qtubuntu,
+Depends: libqt5sensors5,
+         qtubuntu-sensors,
+         ubuntu-application-api3-touch,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
+ QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
+ QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
+ legacy QPA plugin based on the compatibility layers. It also provides Qt
+ bindings for Ubuntu Platform API features that are not exposed through the QPA
+ plugins.
+ .
+ This variant of the package is for Android-based phones and tablets (built
+ against the OpenGLES variant of qtbase).

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2016-02-03 00:32:40 +0000
@@ -0,0 +1,48 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: qtubuntu
+
+Files: *
+Copyright: 2013 Canonical Ltd.
+License: LGPL-3
+
+Files: debian/*
+Copyright: 2013 Canonical Ltd.
+License: GPL-3
+
+Files: tests/*
+Copyright: 2013 Canonical Ltd.
+License: GPL-3
+
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation, version 3 of
+ the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2016-02-03 00:32:40 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'debian/qtubuntu-android.install'
--- debian/qtubuntu-android.install	1970-01-01 00:00:00 +0000
+++ debian/qtubuntu-android.install	2016-02-03 00:32:40 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/plugins/platforms/*

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2016-02-03 00:32:40 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+VERSION := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p')
+SOURCE := $(shell dpkg-parsechangelog | sed -n -e's/^Source: \(.*\)-gles/\1/p')
+ANDROID_DIR = build-android
+TMP1_DIR = $(CURDIR)/debian/tmp1
+
+# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
+get-orig-source:
+	find ~/silos/$(SILONAME) -name $(SOURCE)_$(VERSION).orig.tar.gz -exec \
+		cp \{} $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz \;
+
+%:
+	dh $@
+
+override_dh_clean:
+	rm -rf $(TMP1_DIR)
+	dh_clean
+
+override_dh_auto_configure:
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+
+override_dh_auto_build:
+	dh_auto_build -B$(ANDROID_DIR)
+
+override_dh_auto_install:
+	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
+	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
+	cd $(CURDIR)
+
+override_dh_install:
+	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2016-02-03 00:32:40 +0000
@@ -0,0 +1,1 @@
+1.0