QtMir

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

  1. gles-sync
  2. Merge into gles
Proposed by Michał Sawicz on 2015-01-13
Status: Merged
Approved by: Michał Sawicz on 2015-01-14
Approved revision: no longer in the source branch.
Merged at revision: 64
Proposed branch: lp:~mir-team/qtmir/gles-sync
Merge into: lp:qtmir/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/qtmir/gles-sync
Reviewer Review Type Date Requested Status
Michał Sawicz Approve on 2015-01-14
Review via email: mp+246339@code.launchpad.net
To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve
lp:~mir-team/qtmir/gles-sync updated on 2015-01-14
64. By CI Train Bot Account on 2015-01-14

Sync with upstream

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-01-09 17:55:35 +0000
3+++ debian/changelog 2015-01-14 09:07:25 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.4+15.04.20150114-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with upstream
8+
9+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 14 Jan 2015 10:07:07 +0100
10+
11 qtmir-gles (0.4.4+15.04.20150109-0ubuntu1) vivid; urgency=medium
12
13 [ Michał Sawicz ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-01-09 17:35:14 +0000
17+++ debian/watch 2015-01-14 09:07:25 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-001/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-018/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: