Merge lp:~alan-griffiths/qtmir/mir-0.27-compat-artful into lp:qtmir

Proposed by Alan Griffiths
Status: Approved
Approved by: Alan Griffiths
Approved revision: 640
Proposed branch: lp:~alan-griffiths/qtmir/mir-0.27-compat-artful
Merge into: lp:qtmir
Diff against target: 37 lines (+12/-0)
2 files modified
debian/changelog (+6/-0)
tests/framework/fake_displayconfigurationoutput.h (+6/-0)
To merge this branch: bzr merge lp:~alan-griffiths/qtmir/mir-0.27-compat-artful
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+327115@code.launchpad.net

Commit message

Fix FTBFS for with Mir 0.27

To post a comment you must log in.
641. By Alan Griffiths

Update changelog

Revision history for this message
Gerry Boland (gerboland) :
review: Approve

Unmerged revisions

641. By Alan Griffiths

Update changelog

640. By Alan Griffiths

  Fix FTBFS witn Mir 0.27

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 2017-04-04 00:47:22 +0000
3+++ debian/changelog 2017-07-10 16:22:51 +0000
4@@ -1,3 +1,9 @@
5+qtmir (0.5.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Rebuild for Mir 0.27
8+
9+ -- Alan Griffiths <alan.griffiths@canonical.com> Mon, Jul 2017 16:15:02 +0100
10+
11 qtmir (0.5.1+17.04.20170404-0ubuntu1) zesty; urgency=medium
12
13 [ Albert Astals Cid ]
14
15=== modified file 'tests/framework/fake_displayconfigurationoutput.h'
16--- tests/framework/fake_displayconfigurationoutput.h 2017-02-02 13:13:39 +0000
17+++ tests/framework/fake_displayconfigurationoutput.h 2017-07-10 16:22:51 +0000
18@@ -53,6 +53,9 @@
19 {},
20 mir_output_gamma_unsupported,
21 {}
22+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
23+ ,{}
24+#endif
25 };
26
27 const mg::DisplayConfigurationOutput fakeOutput2
28@@ -83,6 +86,9 @@
29 {},
30 mir_output_gamma_unsupported,
31 {}
32+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
33+ ,{}
34+#endif
35 };
36
37 #endif // FAKE_DISPLAYCONFIGURATIONOUTPUT_H

Subscribers

People subscribed via source and target branches