QtMir

Merge lp:~timo-jyrinki/qtmir/gles_20150220 into lp:qtmir/gles

  1. gles_20150220
  2. Merge into gles
Proposed by Timo Jyrinki on 2015-02-20
Status: Merged
Approved by: Gerry Boland on 2015-02-20
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~timo-jyrinki/qtmir/gles_20150220
Merge into: lp:qtmir/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:~timo-jyrinki/qtmir/gles_20150220
Reviewer Review Type Date Requested Status
Gerry Boland 2015-02-20 Approve on 2015-02-20
Review via email: mp+250435@code.launchpad.net

Commit Message

Sync with upstream

To post a comment you must log in.
Gerry Boland (gerboland) :
review: Approve

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-02-16 14:19:34 +0000
3+++ debian/changelog 2015-02-20 12:28:23 +0000
4@@ -1,3 +1,10 @@
5+qtmir-gles (0.4.4+15.04.20150220-0ubuntu1) UNRELEASED; urgency=medium
6+
7+
8+ * Sync with upstream
9+
10+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 20 Feb 2015 14:18:21 +0200
11+
12 qtmir-gles (0.4.4+15.04.20150209-0ubuntu2) vivid; urgency=medium
13
14 * No-change rebuild against Qt 5.4.0.
15
16=== modified file 'debian/watch'
17--- debian/watch 2015-02-09 23:03:31 +0000
18+++ debian/watch 2015-02-20 12:28:23 +0000
19@@ -1,3 +1,3 @@
20 version=3
21 opts=dversionmangle=s/\-gles// \
22-http://ppa.launchpad.net/ci-train-ppa-service/landing-012/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
23+http://ppa.launchpad.net/ci-train-ppa-service/landing-021/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches