Merge lp://qastaging/~alan-griffiths/unity-system-compositor/mir-0.27-compat-ubuntu into lp://qastaging/unity-system-compositor/ubuntu

Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: 267
Merged at revision: 264
Proposed branch: lp://qastaging/~alan-griffiths/unity-system-compositor/mir-0.27-compat-ubuntu
Merge into: lp://qastaging/unity-system-compositor/ubuntu
Diff against target: 180 lines (+47/-9)
5 files modified
debian/changelog (+12/-6)
debian/rules (+9/-3)
tests/include/usc/test/mock_display.h (+5/-0)
tests/unit-tests/test_mir_input_configuration.cpp (+10/-0)
tests/unit-tests/test_session_switcher.cpp (+11/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/unity-system-compositor/mir-0.27-compat-ubuntu
Reviewer Review Type Date Requested Status
Unity System Compositor Development Team Pending
Review via email: mp+327084@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-07-10.

Commit message

No production source changes (rebuild for Mir 0.27).
Tweak to debian/rules to work on Artful.
Tests updated to build with Mir 0.26 & 0.27

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

Fix merged changelog

268. By Alan Griffiths

Cherrypick fixes to tests for building with Mir 0.26, 0.27

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches