Merge lp:~mzanetti/qtmir/gles-sync into lp:qtmir/gles

[Michael Zanetti]

sync with upstream

[Gerry Boland (gerboland)]

review: Approve

[lp:~mzanetti/qtmir/gles-sync]

101. By Michael Zanetti on 2015-08-19

fix version

102. By Michael Zanetti on 2015-08-27

update sync branch after silo rebuild

103. By Michael Zanetti on 2015-08-27

merge

104. By Michael Zanetti on 2015-08-27

update version

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-24 14:52:38 +0000
+++ debian/changelog	2015-08-27 14:59:58 +0000
@@ -1,3 +1,9 @@
+qtmir-gles (0.4.6+15.04.20150827.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * sync with upstream
+
+ -- Michael Zanetti <[e-mail]>  Wed, 19 Aug 2015 16:27:33 +0200
+
 qtmir-gles (0.4.5+15.10.20150817-0ubuntu1) wily; urgency=medium
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2015-08-05 11:41:20 +0000
+++ debian/control	2015-08-27 14:59:58 +0000
@@ -28,7 +28,7 @@
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.98),
+               libunity-api-dev (>= 7.100),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,

=== modified file 'debian/watch'
--- debian/watch	2015-08-24 14:42:00 +0000
+++ debian/watch	2015-08-27 14:59:58 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-028/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
+http://ppa.launchpad.net/ci-train-ppa-service/landing-023/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz