lp://staging/unity-system-compositor

Branch merges

Propose for merging

15 branches proposed for merging into this one.

No branches dependent on this one.

Merged into lp://staging/unity-system-compositor/ubuntu at revision 207

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-07-14

Unity System Compositor Development Team: Pending requested 2015-06-24

Diff: 2561 lines (+1216/-599)

31 files modified

CMakeLists.txt (+1/-2)
cmake/FindPIL.cmake (+8/-0)
debian/changelog (+6/-0)
debian/control (+1/-2)
debian/unity-system-compositor.install (+0/-1)
spinner/CMakeLists.txt (+45/-11)
spinner/eglapp.cpp (+117/-231)
spinner/eglapp.h (+4/-17)
spinner/eglspinner.cpp (+278/-220)
spinner/miregl.cpp (+247/-0)
spinner/miregl.h (+67/-0)
src/external_spinner.cpp (+17/-0)
src/mir_screen.cpp (+2/-5)
src/mir_screen.h (+1/-1)
src/screen.h (+1/-1)
src/screen_event_handler.cpp (+22/-1)
src/screen_event_handler.h (+1/-0)
src/server.cpp (+50/-7)
src/session_monitor.h (+63/-0)
src/session_switcher.h (+6/-23)
src/window_manager.cpp (+13/-43)
src/window_manager.h (+4/-3)
tests/integration-tests/CMakeLists.txt (+1/-0)
tests/integration-tests/spin_wait.cpp (+39/-0)
tests/integration-tests/spin_wait.h (+39/-0)
tests/integration-tests/test_dbus_event_loop.cpp (+2/-1)
tests/integration-tests/test_external_spinner.cpp (+44/-11)
tests/integration-tests/test_unity_screen_service.cpp (+1/-1)
tests/unit-tests/test_mir_screen.cpp (+8/-5)
tests/unit-tests/test_screen_event_handler.cpp (+42/-13)
tools/png2header.py (+86/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1355609: [regression][v2] unity-system-compositor still FTBFS against Mir 0.6/0.7: undefined reference to `...@MIR_CLIENT_8'

Undecided

New

Link a bug report

Related blueprints

314. By Alan Griffiths on 2017-07-10

No source change (rebuild for Mir 0.27), tweak to debian/rules to work on Artful.

Approved by mir-ci-bot, Gerry Boland.

Merged branch lp://staging/~alan-griffiths/unity-system-compositor/mir-0.27-compat

313. By Stephen M. Webb on 2017-04-03

added autopkgtest (DEP-8) support and some tests. Fixes: https://bugs.launchpad.net/bugs/1678202.

Approved by mir-ci-bot, Brandon Schaefer.

Merged branch lp://staging/~bregma/unity-system-compositor/add-autopkgtest

Bug #1678202: add DEP-8 compatible integration testing

312. By Stephen M. Webb on 2017-04-03

added manpages for binaries. Fixes: https://bugs.launchpad.net/bugs/1677721.

Approved by Brandon Schaefer, mir-ci-bot.

Merged branch lp://staging/~bregma/unity-system-compositor/lp-1677721

Bug #1677721: missing manpages for binaries

311. By Stephen M. Webb on 2017-04-03

added the lightdm log files to the apport dump for error reporting. Fixes: https://bugs.launchpad.net/bugs/1676931.

Approved by mir-ci-bot, Alexandros Frantzis.

Merged branch lp://staging/~bregma/unity-system-compositor/lp-1676931

Bug #1676931: logs are not included in unity-system-compositor bugs automatically reported to Ubuntu using apport

310. By Stephen M. Webb on 2017-04-03

fix assorted lintian warnings in Deb packaging. Fixes: https://bugs.launchpad.net/bugs/1677734.

Approved by Brandon Schaefer, Alexandros Frantzis, mir-ci-bot.

Merged branch lp://staging/~bregma/unity-system-compositor/lp-1677734

Bug #1677734: Debian packaging has several trivial Lintian warnings

309. By Stephen M. Webb on 2017-04-03

src/com.canonical.Unity.conf: remove at_console policy stanza. Fixes: https://bugs.launchpad.net/bugs/1677743.

Approved by Brandon Schaefer, Alberto Aguirre, mir-ci-bot.

Merged branch lp://staging/~bregma/unity-system-compositor/lp-1677743

Bug #1677743: D-Bus conf uses archaic at_console policy

308. By Alan Griffiths on 2017-04-01

Fix build against lp:mir (and Mir 0.26!).

Approved by mir-ci-bot, Brandon Schaefer, Stephen M. Webb.

Merged branch lp://staging/~alan-griffiths/unity-system-compositor/compatibility

307. By Alexandros Frantzis on 2017-02-06

Update the Unity.Display DBus interface to support multiple outputs better.

Approved by mir-ci-bot.

Merged branch lp://staging/~afrantzis/unity-system-compositor/dbus-active-outputs

306. By Alexandros Frantzis on 2017-02-06

Update code for Mir changes up to r4015.

Approved by mir-ci-bot.

Merged branch lp://staging/~afrantzis/unity-system-compositor/update-for-mir-r4015

305. By Cemil Azizoglu on 2017-01-20

Address deprecations in mir.

Approved by mir-ci-bot, Brandon Schaefer.

Merged branch lp://staging/~cemil-azizoglu/unity-system-compositor/address-deprecations