lp://qastaging/mir/0.24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/mir/ubuntu at revision 1291

Cemil Azizoglu (community): Approve on 2016-09-30

Mir CI Bot: Approve (continuous-integration) on 2016-09-28

Daniel van Vugt: Approve on 2016-09-28

Diff: 462 lines (+220/-20)

19 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+20/-0)
src/client/buffer_factory.cpp (+1/-1)
src/client/input/xkb_mapper.cpp (+2/-1)
src/client/rpc/mir_protobuf_rpc_channel.cpp (+0/-5)
src/common/dispatch/CMakeLists.txt (+1/-0)
src/common/dispatch/legacy_readable_fd.cpp (+34/-0)
src/common/symbols.map (+9/-0)
src/platforms/eglstream-kms/client/client_platform.cpp (+1/-2)
src/platforms/eglstream-kms/client/client_platform.h (+1/-4)
src/platforms/eglstream-kms/server/platform.cpp (+1/-2)
src/platforms/eglstream-kms/server/platform.h (+0/-1)
src/server/graphics/nested/display_buffer.cpp (+1/-0)
src/server/shell/abstract_shell.cpp (+3/-1)
tests/unit-tests/client/input/test_xkb_mapper.cpp (+9/-0)
tests/unit-tests/graphics/mesa/test_ipc_operations.cpp (+4/-0)
tests/unit-tests/graphics/nested/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp (+105/-0)
tests/unit-tests/scene/test_abstract_shell.cpp (+26/-2)

api

Superseded for merging into lp://qastaging/mir

Daniel van Vugt: Needs Resubmitting on 2016-09-27

Mir CI Bot: Needs Fixing (continuous-integration) on 2016-09-27

Diff: 164 lines (+54/-7) (has conflicts)

8 files modified

CMakeLists.txt (+2/-2)
debian/changelog (+18/-0)
src/common/symbols.map (+3/-0)
src/platform/symbols.map (+1/-1)
src/platforms/CMakeLists.txt (+5/-0)
src/server/symbols.map (+4/-0)
tests/CMakeLists.txt (+19/-2)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3645. By Daniel van Vugt on 2016-11-09

Add a changelog entry for 0.24.2

3644. By Daniel van Vugt on 2016-11-09

Fix zesty build failures: Structures which contain variable-length
arrays can only be instantiated correctly using dynamic memory
allocation (LP: #1638774)

3643. By Daniel van Vugt on 2016-11-09

Merge final 0.24.1+16.10.20160928-0ubuntu1 changelog from Ubuntu

3642. By Daniel van Vugt on 2016-10-11

Next version (if any) would be 0.24.2

3641. By Andreas Pokorny on 2016-09-28

cherry picked bug fix from lp:mir

3640. By Daniel van Vugt on 2016-09-28

Mention LP: #1612012 in the changelog

3639. By Daniel van Vugt on 2016-09-28

Cherry pick r3656 from lp:mir to fix CI failures (and a potential
crash) (LP: #1612012)

3638. By Daniel van Vugt on 2016-09-28

Mention LP: #1609612 in the changelog

3637. By Daniel van Vugt on 2016-09-28

Cherry pick r3635 from lp:mir (LP: #1609612 fix 2 of 3)

3636. By Daniel van Vugt on 2016-09-28

Cherry pick r3625 from lp:mir (LP: #1609612 fix 1 of 3)