qtubuntu

Merge lp:~timo-jyrinki/qtubuntu/gles-sync-20140808 into lp:qtubuntu/gles

  1. gles-sync-20140808
  2. Merge into gles
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 5
Merged at revision: 5
Proposed branch: lp:~timo-jyrinki/qtubuntu/gles-sync-20140808
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:~timo-jyrinki/qtubuntu/gles-sync-20140808
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Review via email: mp+230101@code.launchpad.net

Commit message

Sync with upstream.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) :
review: Approve
lp:~timo-jyrinki/qtubuntu/gles-sync-20140808 updated
6. By Timo Jyrinki

Fix version

7. By Timo Jyrinki

Prepare for Gerry's changes in the main branch by bumping version number.

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-07-28 04:23:23 +0000
3+++ debian/changelog 2014-08-08 14:00:50 +0000
4@@ -1,3 +1,9 @@
5+qtubuntu-gles (0.60+14.10.20140808.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream.
8+
9+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 08 Aug 2014 15:49:32 +0300
10+
11 qtubuntu-gles (0.60+14.10.20140728-0ubuntu1) utopic; urgency=medium
12
13 [ Gerry Boland ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-07-15 15:52:38 +0000
17+++ debian/watch 2014-08-08 14:00:50 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-006/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-015/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches