Merge lp:~mir-team/qtmir/gles-sync into lp:qtmir/gles

[Gerry Boland]

Sync with upstream

[Michael Zanetti (mzanetti)]

ack

review: Approve

[lp:~mir-team/qtmir/gles-sync]

83. By Gerry Boland on 2015-05-11

Sync with upstream
Approved by: Michael Zanetti

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-18 10:52:48 +0000
+++ debian/changelog	2015-05-11 13:54:35 +0000
@@ -1,3 +1,9 @@
+qtmir-gles (0.4.4+15.04.20150511.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Sync with upstream
+
+ -- Gerry Boland <[e-mail]>  Mon, 11 May 2015 11:58:26 +0100
+
 qtmir-gles (0.4.4+15.04.20150318-0ubuntu1) vivid; urgency=medium
 
   [ Michał Sawicz ]

=== modified file 'debian/control'
--- debian/control	2015-03-18 10:50:14 +0000
+++ debian/control	2015-05-11 13:54:35 +0000
@@ -14,6 +14,7 @@
                libfontconfig1-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
+               libgsettings-qt-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.6.0),
                libmircommon-dev,

=== modified file 'debian/watch'
--- debian/watch	2015-03-18 10:50:14 +0000
+++ debian/watch	2015-05-11 13:54:35 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-006/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
+http://ppa.launchpad.net/ci-train-ppa-service/landing-038/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz