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: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 27
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
Michael Zanetti (community) Approve
Review via email: mp+262253@code.launchpad.net

Commit message

Sync with upstream

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

ack

review: Approve
lp:~mir-team/qtubuntu/gles-sync updated
27. By Gerry Boland

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-06-15 15:58:50 +0000
+++ debian/changelog 2015-06-17 17:05:55 +0000
@@ -1,3 +1,9 @@
1qtubuntu-gles (0.61+15.10.20150617-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Sync with upstream
4
5 -- Gerry Boland <gerry.boland@canonical.com> Wed, 17 Jun 2015 18:04:33 +0100
6
1qtubuntu-gles (0.61+15.10.20150611-0ubuntu2) wily; urgency=medium7qtubuntu-gles (0.61+15.10.20150611-0ubuntu2) wily; urgency=medium
28
3 * No-change rebuild against Qt 5.4.2.9 * No-change rebuild against Qt 5.4.2.
410
=== modified file 'debian/watch'
--- debian/watch 2015-06-02 09:50:08 +0000
+++ debian/watch 2015-06-17 17:05:55 +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-004/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz3http://ppa.launchpad.net/ci-train-ppa-service/landing-036/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches