Merge lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0 into lp:qtubuntu/gles

Proposed by Andreas Pokorny on 2015-07-08
Status: Merged
Approved by: Gerry Boland on 2015-07-10
Approved revision: 32
Merged at revision: 31
Proposed branch: lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0
Merge into: lp:qtubuntu/gles
Diff against target: 23 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~mir-team/qtubuntu/qtubuntu-gles-mir-release-0.14.0
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2015-07-08 Approve on 2015-07-10
Review via email: mp+264185@code.launchpad.net

Commit message

in step with mir release 0.14.0 gles sync

Description of the change

in step with mir release 0.14.0 gles sync

To post a comment you must log in.
32. By Andreas Pokorny on 2015-07-09

Sync with upstream

Gerry Boland (gerboland) :
review: Approve
33. By Andreas Pokorny on 2015-07-22

sync with qtubuntu

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-07-07 00:54:51 +0000
3+++ debian/changelog 2015-07-22 14:13:32 +0000
4@@ -1,3 +1,10 @@
5+qtubuntu-gles (0.61+15.10.20150722-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Andreas Pokorny ]
8+ * Sync with upstream
9+
10+ -- Andreas Pokorny <andreas.pokorny@canonical.com> Thu, 09 Jul 2015 14:51:35 +0200
11+
12 qtubuntu-gles (0.61+15.10.20150706-0ubuntu1) wily; urgency=medium
13
14 [ Alberto Aguirre ]
15
16=== modified file 'debian/watch'
17--- debian/watch 2015-06-23 22:21:10 +0000
18+++ debian/watch 2015-07-22 14:13:32 +0000
19@@ -1,3 +1,3 @@
20 version=3
21 opts=dversionmangle=s/\-gles// \
22-http://ppa.launchpad.net/ci-train-ppa-service/landing-013/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
23+http://ppa.launchpad.net/ci-train-ppa-service/landing-004/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches