Merge lp:~kgunn72/qtmir/gles-sync-shellrotation into lp:qtmir/gles

Proposed by kevin gunn
Status: Rejected
Rejected by: Gerry Boland
Proposed branch: lp:~kgunn72/qtmir/gles-sync-shellrotation
Merge into: lp:qtmir/gles
Diff against target: 36 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~kgunn72/qtmir/gles-sync-shellrotation
Reviewer Review Type Date Requested Status
Gerry Boland (community) Disapprove
Review via email: mp+261286@code.launchpad.net

Commit message

sync with upstream

Description of the change

sync with upstream

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Mirv duplicated this somehow when landing shell rotation, is unneeded now

review: Disapprove

Unmerged revisions

95. By kevin gunn

today

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-05-13 10:56:41 +0000
3+++ debian/changelog 2015-06-05 20:13:04 +0000
4@@ -1,3 +1,10 @@
5+qtmir-gles (0.4.5+15.10.20150605-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Kevin Gunn ]
8+ * sync with upstream
9+
10+ -- Kevin Gunn <kevin.gunn@canonical.com> Fri, 05 Jun 2015 15:08:30 -0500
11+
12 qtmir-gles (0.4.4+15.04.20150513-0ubuntu1) vivid; urgency=medium
13
14 [ Alan Griffiths ]
15
16=== modified file 'debian/control'
17--- debian/control 2015-05-13 10:56:07 +0000
18+++ debian/control 2015-06-05 20:13:04 +0000
19@@ -32,7 +32,7 @@
20 libubuntu-app-launch2-dev,
21 libubuntu-application-api-dev (>= 2.1.0),
22 libudev-dev,
23- libunity-api-dev (>= 7.92),
24+ libunity-api-dev (>= 7.97),
25 liburl-dispatcher1-dev,
26 libxkbcommon-dev,
27 libxrender-dev,
28
29=== modified file 'debian/watch'
30--- debian/watch 2015-05-13 10:56:07 +0000
31+++ debian/watch 2015-06-05 20:13:04 +0000
32@@ -1,3 +1,3 @@
33 version=3
34 opts=dversionmangle=s/\-gles// \
35-http://ppa.launchpad.net/ci-train-ppa-service/landing-021/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
36+http://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