Merge lp:~gerboland/qtubuntu/gles-sync-silo5 into lp:qtubuntu

[Gerry Boland]

Sync with qtubuntu

[lp:~gerboland/qtubuntu/gles-sync-silo5]

9. By Gerry Boland on 2014-08-15

Sync with trunk

Unmerged revisions

9. By Gerry Boland on 2014-08-15

Sync with trunk

8. By PS Jenkins bot on 2014-08-12

Releasing 0.60+14.10.20140812-0ubuntu1

7. By Ricardo Salveti on 2014-08-12

Sync package with qtubuntu - 0.60+14.10.20140806-0ubuntu1

6. By PS Jenkins bot on 2014-08-08

Releasing 0.60+14.10.20140808.1-0ubuntu1

5. By Timo Jyrinki on 2014-08-08

Sync with upstream. Fixes: 1351024
Approved by: Timo Jyrinki

4. By PS Jenkins bot on 2014-07-28

Releasing 0.60+14.10.20140728-0ubuntu1

3. By Gerry Boland on 2014-07-28

Sync with qtubuntu 0.60+14.10.20140724-0ubuntu1
Approved by: Gerry Boland

2. By Ricardo Salveti on 2014-07-15

debian/watch: changing to a silo that doesn't exist, so it can be used as reference

1. By Ricardo Salveti on 2014-07-15

releasing package qtubuntu-gles version 0.54+14.10.20140613-0ubuntu2

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-08-15 12:54:04 +0000
@@ -0,0 +1,79 @@
+qtubuntu-gles (0.60+14.10.20140815-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Sync with qtubuntu
+
+ -- Gerry Boland <[e-mail]>  Fri, 15 Aug 2014 13:50:41 +0100
+
+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	2014-08-15 12:54:04 +0000
@@ -0,0 +1,1 @@
+9
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-08-15 12:54:04 +0000
@@ -0,0 +1,45 @@
+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,
+               libqt5gui5-gles,
+               libqt5sensors5-dev,
+               libqt5quicktest5,
+               libubuntu-application-api-dev (>= 2.2.0),
+               libudev-dev,
+               libxrender-dev,
+               libxkbcommon-dev,
+               qt5-default,
+               qtbase5-gles-dev,
+               qtbase5-private-gles-dev,
+               qtdeclarative5-dev,
+Standards-Version: 3.9.4
+Section: libs
+X-Auto-Uploader: no-rewrite-version
+
+Package: qtubuntu-android
+Architecture: i386 amd64
+Multi-Arch: same
+Conflicts: qtubuntu-android, qtubuntu-desktop
+Replaces: qtubuntu-android
+Provides: qtubuntu
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libqt5sensors5,
+         qtubuntu-sensors,
+         ubuntu-application-api2-touch,
+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	2014-08-15 12:54:04 +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	2014-08-15 12:54:04 +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	2014-08-15 12:54:04 +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	2014-08-15 12:54:04 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+ANDROID_DIR = build-android
+TMP1_DIR = $(CURDIR)/debian/tmp1
+
+%:
+	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	2014-08-15 12:54:04 +0000
@@ -0,0 +1,1 @@
+1.0
 
=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2014-08-15 12:54:04 +0000
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\-gles// \
+http://ppa.launchpad.net/ci-train-ppa-service/landing-005/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz