QtMir

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

  1. gles-sync
  2. Merge into gles
Proposed by Gerry Boland on 2015-06-17
Status: Merged
Approved by: Michael Zanetti on 2015-06-18
Approved revision: no longer in the source branch.
Merged at revision: 90
Proposed branch: lp:~mir-team/qtmir/gles-sync
Merge into: lp:qtmir/gles
Diff against target: 22 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~mir-team/qtmir/gles-sync
Reviewer Review Type Date Requested Status
Michael Zanetti (community) 2015-06-17 Approve on 2015-06-18
Review via email: mp+262252@code.launchpad.net

Commit Message

Sync with upstream

To post a comment you must log in.
Michael Zanetti (mzanetti) wrote :

ack

review: Approve
lp:~mir-team/qtmir/gles-sync updated on 2015-06-23
90. By Gerry Boland on 2015-06-17

Sync with upstream

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-06-15 15:57:52 +0000
3+++ debian/changelog 2015-06-17 17:02:09 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.5+15.10.20150617-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Gerry Boland <gerry.boland@canonical.com> Wed, 17 Jun 2015 17:50:30 +0100
10+
11 qtmir-gles (0.4.5+15.10.20150611-0ubuntu2) wily; urgency=medium
12
13 * No-change rebuild against Qt 5.4.2.
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-05-26 09:47:26 +0000
17+++ debian/watch 2015-06-17 17:02:09 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-004/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-036/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: