qtubuntu

Merge lp:~gerboland/qtubuntu/gles-sync-silo5 into lp:qtubuntu/gles

  1. gles-sync-silo5
  2. Merge into gles
Proposed by Gerry Boland
Status: Merged
Approved by: kevin gunn
Approved revision: no longer in the source branch.
Merged at revision: 9
Proposed branch: lp:~gerboland/qtubuntu/gles-sync-silo5
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:~gerboland/qtubuntu/gles-sync-silo5
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+230970@code.launchpad.net

This proposal supersedes a proposal from 2014-08-15.

Commit message

Sync with qtubuntu

Description of the change

Sync with qtubuntu

To post a comment you must log in.
lp:~gerboland/qtubuntu/gles-sync-silo5 updated
9. By Gerry Boland

Sync with trunk

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 2014-08-12 19:37:55 +0000
3+++ debian/changelog 2014-08-15 16:53:56 +0000
4@@ -1,3 +1,9 @@
5+qtubuntu-gles (0.60+14.10.20140815.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with qtubuntu
8+
9+ -- Gerry Boland <gerry.boland@canonical.com> Fri, 15 Aug 2014 13:50:41 +0100
10+
11 qtubuntu-gles (0.60+14.10.20140812-0ubuntu1) utopic; urgency=medium
12
13 [ Ricardo Mendoza ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-08-12 14:38:09 +0000
17+++ debian/watch 2014-08-15 16:53:56 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-018/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-005/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches