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

Proposed by Gerry Boland on 2015-12-01
Status: Merged
Approved by: Michał Sawicz on 2015-12-03
Approved revision: no longer in the source branch.
Merged at revision: 138
Proposed branch: lp:~mir-team/qtmir/gles-sync
Merge into: lp:qtmir/gles
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~mir-team/qtmir/gles-sync
Reviewer Review Type Date Requested Status
Mir development team 2015-12-01 Pending
Review via email: mp+279108@code.launchpad.net

Commit Message

Sync with trunk

To post a comment you must log in.
lp:~mir-team/qtmir/gles-sync updated on 2015-12-10
136. By Timo Jyrinki on 2015-12-01

Rebuild against Qt 5.5.1.

137. By Timo Jyrinki on 2015-12-08

Add libqt5test5 to dependencies.

138. By Michał Sawicz on 2015-12-10

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 2015-12-01 14:18:22 +0000
3+++ debian/changelog 2015-12-07 14:22:23 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.7-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream version
8+
9+ -- Michal Sawicz <michal.sawicz@canonical.com> Mon, 07 Dec 2015 14:40:18 +0100
10+
11 qtmir-gles (0.4.6+16.04.20151125-0ubuntu2) xenial; urgency=medium
12
13 * Rebuild against Qt 5.5.1.
14
15=== modified file 'debian/control'
16--- debian/control 2015-10-27 16:00:15 +0000
17+++ debian/control 2015-12-07 14:22:23 +0000
18@@ -27,7 +27,7 @@
19 libubuntu-app-launch2-dev,
20 libubuntu-application-api-dev (>= 2.1.0),
21 libudev-dev,
22- libunity-api-dev (>= 7.101),
23+ libunity-api-dev (>= 7.104),
24 liburl-dispatcher1-dev,
25 libxkbcommon-dev,
26 libxrender-dev,

Subscribers

People subscribed via source and target branches

to all changes: