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

Proposed by Michael Zanetti
Status: Merged
Approved by: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 87
Proposed branch: lp:~mzanetti/qtmir/gles-sync
Merge into: lp:qtmir/gles
Diff against target: 35 lines (+8/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~mzanetti/qtmir/gles-sync
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+260828@code.launchpad.net

This proposal supersedes a proposal from 2015-05-26.

Description of the change

Release in step with shellRotation

To post a comment you must log in.
lp:~mzanetti/qtmir/gles-sync updated
87. By CI Train Bot Account

Sync with upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-05-13 10:56:41 +0000
+++ debian/changelog 2015-06-11 11:17:58 +0000
@@ -1,3 +1,9 @@
1qtmir-gles (0.4.5+15.10.20150611-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Sync with upstream
4
5 -- Michael Zanetti <michael.zanetti@canonical.com> Tue, 02 Jun 2015 11:41:40 +0000
6
1qtmir-gles (0.4.4+15.04.20150513-0ubuntu1) vivid; urgency=medium7qtmir-gles (0.4.4+15.04.20150513-0ubuntu1) vivid; urgency=medium
28
3 [ Alan Griffiths ]9 [ Alan Griffiths ]
410
=== modified file 'debian/control'
--- debian/control 2015-05-13 10:56:07 +0000
+++ debian/control 2015-06-11 11:17:58 +0000
@@ -32,7 +32,7 @@
32 libubuntu-app-launch2-dev,32 libubuntu-app-launch2-dev,
33 libubuntu-application-api-dev (>= 2.1.0),33 libubuntu-application-api-dev (>= 2.1.0),
34 libudev-dev,34 libudev-dev,
35 libunity-api-dev (>= 7.92),35 libunity-api-dev (>= 7.97),
36 liburl-dispatcher1-dev,36 liburl-dispatcher1-dev,
37 libxkbcommon-dev,37 libxkbcommon-dev,
38 libxrender-dev,38 libxrender-dev,
3939
=== modified file 'debian/watch'
--- debian/watch 2015-05-13 10:56:07 +0000
+++ debian/watch 2015-06-11 11:17:58 +0000
@@ -1,3 +1,3 @@
1version=31version=3
2opts=dversionmangle=s/\-gles// \2opts=dversionmangle=s/\-gles// \
3http://ppa.launchpad.net/ci-train-ppa-service/landing-021/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz3http://ppa.launchpad.net/ci-train-ppa-service/landing-004/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches