Merge lp:~unity-team/qtubuntu/gles-qtcomp-refactor into lp:qtubuntu/gles

[Michał Sawicz]

Sync with qtubuntu 0.60+14.10.20140724-0ubuntu1

[Gerry Boland (gerboland)]

review: Approve

[lp:~unity-team/qtubuntu/gles-qtcomp-refactor]

3. By Gerry Boland on 2014-07-28

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-15 15:13:08 +0000
+++ debian/changelog	2014-07-28 04:20:19 +0000
@@ -1,3 +1,11 @@
+qtubuntu-gles (0.60+14.10.20140728-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Gerry Boland ]
+  * Major refactor: remove SurfaceFlinger & Mir in-server-process-client
+    support, flatten class hierarchy. Only Mir client QPA remains
+
+ -- Kevin Gunn <[e-mail]>  Sun, 27 Jul 2014 23:18:01 -0500
+
 qtubuntu-gles (0.54+14.10.20140613-0ubuntu2) utopic; urgency=medium
 
   * debian/control: should depend on libqt5quickwidgets5-gles instead
 
=== modified file 'debian/control'
--- debian/control	2014-07-15 15:13:08 +0000
+++ debian/control	2014-07-28 04:20:19 +0000
@@ -3,27 +3,25 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libatspi2.0-dev,
-               libdbus-1-dev,
                libegl1-mesa-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
-               libhybris-dev,
-               libubuntu-application-api-dev (>= 2.0.0),
+               libqt5gui5-gles,
+               libqt5sensors5-dev,
+               libqt5quicktest5,
+               libubuntu-application-api-dev (>= 2.2.0),
                libudev-dev,
                libxrender-dev,
                libxkbcommon-dev,
-               libqt5gui5-gles,
-               libqt5quicktest5,
-               libqt5quickwidgets5-gles,
                qt5-default,
+               qtbase5-gles-dev,
                qtbase5-private-gles-dev,
                qtdeclarative5-dev,
-               libqt5sensors5-dev,
-               zlib1g-dev,
 Standards-Version: 3.9.4
 Section: libs
+X-Auto-Uploader: no-rewrite-version
 
 Package: qtubuntu-android
 Architecture: i386 amd64
 
=== modified file 'debian/docs'
--- debian/docs	2014-07-15 15:13:08 +0000
+++ debian/docs	2014-07-28 04:20:19 +0000
@@ -1,2 +1,1 @@
 README
-TODO
 
=== modified file 'debian/rules'
--- debian/rules	2014-07-15 15:13:08 +0000
+++ debian/rules	2014-07-28 04:20:19 +0000
@@ -14,7 +14,7 @@
 	dh_clean
 
 override_dh_auto_configure:
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+	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)
 
=== modified file 'debian/watch'
--- debian/watch	2014-07-15 15:37:25 +0000
+++ debian/watch	2014-07-28 04:20:19 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-021/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
+http://ppa.launchpad.net/ci-train-ppa-service/landing-006/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz