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

[Alan Griffiths]

Release in step with Mir 0.13.0

Release in step with Mir 0.13.0

[Cemil Azizoglu (cemil-azizoglu)]

22 - libmirclient-dev (>= 0.6.0),
23 - libmircommon-dev,
24 - libmirserver-dev (>= 0.6.0),
25 + libmirclient-dev (>= 0.13.0),
26 + libmircommon-dev (>= 0.13.0),
27 + libmirserver-dev (>= 0.13.0),

I don't know if these are needed. We have never had to bump these. Saviq knows more.

[Alan Griffiths (alan-griffiths)]

> 22 - libmirclient-dev (>= 0.6.0),
> 23 - libmircommon-dev,
> 24 - libmirserver-dev (>= 0.6.0),
> 25 + libmirclient-dev (>= 0.13.0),
> 26 + libmircommon-dev (>= 0.13.0),
> 27 + libmirserver-dev (>= 0.13.0),
>
> I don't know if these are needed. We have never had to bump these. Saviq knows
> more.

These are the same as the qtmir dependencies (there are some gles related variations that we don't care about).

[Michał Sawicz (saviq)]

@Cemil we always need to keep this in sync with lp:qtmir itself, so yeah.

Looks in concert with lp:qtmir/devel-mir-next, ACK.

review: Approve

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

83. By Gerry Boland on 2015-05-11

Sync with upstream
Approved by: Michael Zanetti

84. By CI Train Bot Account on 2015-05-11

Releasing 0.4.4+15.04.20150511.1-0ubuntu1

85. By Alan Griffiths on 2015-05-13

Release in step with Mir 0.13.0
Approved by: Michał Sawicz

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-11 13:55:09 +0000
+++ debian/changelog	2015-05-13 10:56:14 +0000
@@ -1,3 +1,9 @@
+qtmir-gles (0.4.4+15.04.20150513-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Sync with upstream
+
+ -- Alan Griffiths <alan@Octopull-desktop>  Wed, 13 May 2015 11:46:45 +0100
+
 qtmir-gles (0.4.4+15.04.20150511.1-0ubuntu1) vivid; urgency=medium
 
   [ Gerry Boland ]

=== modified file 'debian/control'
--- debian/control	2015-05-11 13:04:11 +0000
+++ debian/control	2015-05-13 10:56:14 +0000
@@ -16,9 +16,9 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                liblttng-ust-dev,
-               libmirclient-dev (>= 0.6.0),
-               libmircommon-dev,
-               libmirserver-dev (>= 0.6.0),
+               libmirclient-dev (>= 0.13.0),
+               libmircommon-dev (>= 0.13.0),
+               libmirserver-dev (>= 0.13.0),
                libmtdev-dev,
                libprocess-cpp-dev,
                libqt5gui5-gles,

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