qtubuntu

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

  1. gles-sync
  2. Merge into gles
Proposed by Gerry Boland
Status: Merged
Approved by: Gerry Boland
Approved revision: 38
Merged at revision: 38
Proposed branch: lp:~mir-team/qtubuntu/gles-sync
Merge into: lp:qtubuntu/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/qtubuntu/gles-sync
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+269178@code.launchpad.net

Commit message

Sync with upstream

To post a comment you must log in.
lp:~mir-team/qtubuntu/gles-sync updated
37. By Gerry Boland

Merge trunk

38. By Gerry Boland

Bump changelog

Revision history for this message
Gerry Boland (gerboland) :
review: Approve
lp:~mir-team/qtubuntu/gles-sync updated
39. By Gerry Boland

Sync with upstream

Revision history for this message
Gerry Boland (gerboland) :
review: Approve
lp:~mir-team/qtubuntu/gles-sync updated
40. By Gerry Boland

Retarget to wily

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-08-28 08:43:25 +0000
3+++ debian/changelog 2015-09-15 12:00:51 +0000
4@@ -1,3 +1,9 @@
5+qtubuntu-gles (0.62+15.10.20150914-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Gerry Boland <gerry.boland@canonical.com> Tue, 15 Sep 2015 11:13:10 +0100
10+
11 qtubuntu-gles (0.62+15.04.20150828-0ubuntu2) vivid; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-08-27 10:07:13 +0000
17+++ debian/watch 2015-09-15 12:00:51 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-023/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-027/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches