lp:~kdub/unity-system-compositor/nochange-rebuild

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:unity-system-compositor/0.3

Unity System Compositor Development Team: Pending requested 2016-01-25

Diff: 109 lines (+71/-31) (has conflicts)

1 file modified

debian/changelog (+71/-31)

api

Rejected for merging into lp:unity-system-compositor/0.2

Unity System Compositor Development Team: Pending requested 2015-11-16

Diff: 2854 lines (+1302/-542) (has conflicts)

45 files modified

CMakeLists.txt (+4/-3)
debian/changelog (+62/-3)
spinner/eglspinner.cpp (+5/-2)
src/CMakeLists.txt (+1/-0)
src/dbus_connection_handle.cpp (+2/-2)
src/dbus_connection_handle.h (+3/-1)
src/dbus_connection_thread.cpp (+5/-11)
src/dbus_connection_thread.h (+3/-7)
src/dbus_event_loop.cpp (+32/-18)
src/dbus_event_loop.h (+4/-2)
src/mir_input_configuration.cpp (+129/-14)
src/mir_input_configuration.h (+34/-11)
src/powerd_mediator.cpp (+6/-6)
src/powerd_mediator.h (+1/-1)
src/screen_event_handler.cpp (+41/-12)
src/screen_event_handler.h (+1/-0)
src/server.cpp (+17/-4)
src/server.h (+3/-0)
src/system_compositor.cpp (+2/-0)
src/system_compositor.h (+2/-0)
src/unity_input_service.cpp (+11/-13)
src/unity_input_service.h (+6/-3)
src/unity_screen_service.cpp (+11/-9)
src/unity_screen_service.h (+5/-3)
tests/CMakeLists.txt (+1/-0)
tests/include/usc/test/mock_display.h (+67/-0)
tests/include/usc/test/mock_input_configuration.h (+48/-0)
tests/include/usc/test/mock_screen.h (+57/-0)
tests/include/usc/test/stub_display_configuration.h (+65/-0)
tests/integration-tests/CMakeLists.txt (+3/-0)
tests/integration-tests/test_dbus_event_loop.cpp (+8/-8)
tests/integration-tests/test_deadlock_lp1491566.cpp (+4/-68)
tests/integration-tests/test_powerd_mediator.cpp (+7/-6)
tests/integration-tests/test_unity_input_service.cpp (+11/-119)
tests/integration-tests/test_unity_screen_service.cpp (+12/-147)
tests/integration-tests/test_unity_services.cpp (+82/-0)
tests/integration-tests/unity_input_dbus_client.cpp (+113/-0)
tests/integration-tests/unity_input_dbus_client.h (+52/-0)
tests/integration-tests/unity_screen_dbus_client.cpp (+112/-0)
tests/integration-tests/unity_screen_dbus_client.h (+54/-0)
tests/unit-tests/CMakeLists.txt (+1/-0)
tests/unit-tests/test_mir_input_configuration.cpp (+114/-0)
tests/unit-tests/test_mir_screen.cpp (+5/-60)
tests/unit-tests/test_screen_event_handler.cpp (+93/-7)
tools/png2header.py (+3/-2)

api

Superseded for merging into lp:unity-system-compositor

Unity System Compositor Development Team: Pending requested 2015-11-13

Diff: 48 lines (+15/-4)

3 files modified

CMakeLists.txt (+2/-2)
debian/changelog (+11/-0)
debian/control (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

271. By Kevin DuBois on 2016-01-27

 update changelog after 0.3 landing

270. By Kevin DuBois on 2016-01-25

bump changelog for no change rebuild

269. By Alexandros Frantzis on 2016-01-21

Unblank the screen when a pointer or key event arrives. Fixes: https://bugs.launchpad.net/bugs/1488413.

Approved by Andreas Pokorny, PS Jenkins bot.

268. By Michael Terry on 2016-01-21

Properly clamp mouseCursorSpeed and touchpadCursorSpeed settings.

Approved by PS Jenkins bot, Andreas Pokorny.

267. By Andreas Pokorny on 2016-01-20

Split out the single DBusConnectionHandle from DBusConnectionThread

This allows having multiple connection names that actually work. As opposed to assigning multiple connection names to a single DBusConnection, in which case the first one wins. Fixes: https://bugs.launchpad.net/bugs/1536383.

Approved by PS Jenkins bot, Alexandros Frantzis.

266. By Andreas Pokorny on 2016-01-20

Move Mocks around and integration test utilities to reuse them in further tests.

Approved by Alexandros Frantzis, PS Jenkins bot.

265. By Andreas Pokorny on 2016-01-19

merge updated change log and version

264. By Andreas Pokorny on 2015-12-07

Use actual image.bytes_per_pixel to decide about GL format of pixel data.

Approved by Alexandros Frantzis, PS Jenkins bot, Kevin DuBois.

263. By Andreas Pokorny on 2015-12-01

Catch all devices with pointer or touchpad capabilities and forward input configuration changes to them.

Approved by Alexandros Frantzis, PS Jenkins bot.

262. By Andreas Pokorny on 2015-12-01

Change keyboard handling to scan codes.

Additionally relevant for ubuntu-pd: use none-phone keys to keep display on. Fixes: https://bugs.launchpad.net/bugs/1514059, https://bugs.launchpad.net/bugs/1520422.

Approved by Alexandros Frantzis, PS Jenkins bot.