Merge lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0 into lp:qtubuntu/gles

[Andreas Pokorny]

in step with mir release 0.14.0 gles sync

in step with mir release 0.14.0 gles sync

[lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0]

32. By Andreas Pokorny on 2015-07-09

Sync with upstream

[Gerry Boland (gerboland)]

review: Approve

[lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0]

33. By Andreas Pokorny on 2015-07-22

sync with qtubuntu

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-07 00:54:51 +0000
+++ debian/changelog	2015-07-22 14:13:32 +0000
@@ -1,3 +1,10 @@
+qtubuntu-gles (0.61+15.10.20150722-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Andreas Pokorny ]
+  * Sync with upstream
+
+ -- Andreas Pokorny <[e-mail]>  Thu, 09 Jul 2015 14:51:35 +0200
+
 qtubuntu-gles (0.61+15.10.20150706-0ubuntu1) wily; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'debian/watch'
--- debian/watch	2015-06-23 22:21:10 +0000
+++ debian/watch	2015-07-22 14:13:32 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-013/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
+http://ppa.launchpad.net/ci-train-ppa-service/landing-004/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz