Merge lp:~alan-griffiths/mir/fix-1415321 into lp:mir

[Alan Griffiths]

common, client: move client library code into libmirclient

common, client: move client library code into libmirclient

This version has reflects a preexisting problem that the MIR_CLIENT_8 stanza contained wildcards leading to previous releases incorrectly publishing new entry points as @MIR_CLIENT_8. (Which is likely what leads to lp:1432998)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2402
http://jenkins.qa.ubuntu.com/job/mir-ci/3208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1629/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1628/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1583/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1583/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3208/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2403
http://jenkins.qa.ubuntu.com/job/mir-ci/3210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1632
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1587/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1207
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1587
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1587/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4600/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18817

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3210/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

"dpkg: error processing archive /home/phablet/archive/./libmirclient-dev_0.13.0bzr2404pkg0vivid1587+autopilot0_armhf.deb (--unpack):
 trying to overwrite '/usr/include/mirclient/mir_toolkit/debug/surface.h', which is also in package libmirclient-debug-extension-dev:armhf 0.13.0bzr2404pkg0vivid1587+autopilot0"

Rats! Those debian/* files are out to get me!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/3216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1213
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1213/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1595
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1595/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4608
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18832

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3216/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm, explicitly naming the functions in the mirclient map seems better.

review: Approve

[Chris Halse Rogers (raof)]

You don't need to bump the SONAME of mirclient-debug-extension.

Like kdub, I like explicitly listing the symbols for mircilent.

I don't think you need to bump mirclient SONAME? The only loss I can see is the symbols exposed purely for the tests and PrivateProtobuf, neither of which are public. abi-compliance-checker will complain, but will be wrong in this case.

I'm not wild about symbols shared between the server and the client being in mirclient - the event builders and the cursor names are used in both. Why shouldn't they be in mircommon?

review: Needs Information

[Daniel van Vugt (vanvugt)]

(1) This is a big deal:
   34 -Package: libmirclient8
   35 +Package: libmirclient9
We need to discuss this a bit (mir-devel?), as it will require a bunch of packages in vivid to be rebuilt that have never needed rebuilding before. Not your fault. This is probably unavoidable since the bug got released with 0.11.0.

Given we haven't broken the COMMON ABI in a long time, we can afford to wait and not fix the bug until we're ready for a client ABI bump. Maybe resubmit first thing after vivid?...
[Resubmit]

(2) The regression test needs to be enabled in examples/CMakeLists.txt:
   # FIXME: Bug not fixed yet.
   if (MIR_ENABLE_TESTS AND MIR_TEST_CLIENT_ABI)
     # Regression tests for LP: #1415321
[Needs Fixing]

review: Needs Resubmitting

[Alan Griffiths (alan-griffiths)]

> (2) The regression test needs to be enabled in examples/CMakeLists.txt:
> # FIXME: Bug not fixed yet.
> if (MIR_ENABLE_TESTS AND MIR_TEST_CLIENT_ABI)
> # Regression tests for LP: #1415321
> [Needs Fixing]

Oddly this fails with clang. E.g.

$ objdump -p bin/.mir_demo_client_basic-uninstalled | grep NEEDED | grep libmir | grep -v libmirclient
  NEEDED libmircommon.so.4
  NEEDED libmirprotobuf.so.0

It looks as though the clang linker creates empty entries for these in the .dynstr section:

$ readelf --string-dump=.dynstr bin/.mir_demo_client_basic-uninstalled

String dump of section '.dynstr':
  [ 1] libmirclient.so.9
  [ 13] mir_buffer_stream_swap_buffers_sync
  [ 37] mir_surface_create
  [ 4a] mir_surface_get_buffer_stream
  [ 68] mir_surface_get_error_message
  [ 86] mir_connection_get_error_message
  [ a7] mir_connection_release
  [ be] mir_surface_spec_release
  [ d7] _Jv_RegisterClasses
  [ eb] mir_connection_is_valid
  [ 103] mir_connect
  [ 10f] mir_wait_for
  [ 11c] mir_surface_release
  [ 130] mir_surface_spec_set_name
  [ 14a] mir_connection_get_available_surface_formats
  [ 177] mir_buffer_stream_get_current_buffer
  [ 19c] mir_connection_get_platform
  [ 1b8] _ITM_deregisterTMCloneTable
  [ 1d4] mir_surface_is_valid
  [ 1e9] __gmon_start__
  [ 1f8] mir_buffer_stream_get_platform_type
  [ 21c] mir_connection_create_spec_for_normal_surface
  [ 24a] _ITM_registerTMCloneTable
  [ 264] libboost_date_time.so.1.55.0
  [ 281] libboost_system.so.1.55.0
  [ 29b] libboost_program_options.so.1.55.0
  [ 2be] libboost_filesystem.so.1.55.0
  [ 2dc] libprotobuf.so.9
  [ 2ed] libxkbcommon.so.0
  [ 2ff] libdl.so.2
  [ 30a] libmircommon.so.4
  [ 31c] libudev.so.1
  [ 329] libmirprotobuf.so.0
  [ 33d] libstdc++.so.6
  [ 34c] libm.so.6
  [ 356] libgcc_s.so.1
  [ 364] libpthread.so.0
  [ 374] libc.so.6
  [ 37e] puts
  [ 383] __assert_fail
  [ 391] getopt
  [ 398] optarg
  [ 39f] stderr
  [ 3a6] atoi
  [ 3ab] fprintf
  [ 3b3] opterr
  [ 3ba] strcmp
  [ 3c1] __libc_start_main
  [ 3d3] _edata
  [ 3da] __bss_start
  [ 3e6] _end
  [ 3eb] _IO_stdin_used
  [ 3fa] __data_start
  [ 407] __libc_csu_init
  [ 417] __libc_csu_fini
  [ 427] demo_client
  [ 433] GLIBC_2.2.5
  [ 43f] MIR_CLIENT_9

[Alan Griffiths (alan-griffiths)]

> I'm not wild about symbols shared between the server and the client being in
> mirclient - the event builders and the cursor names are used in both. Why
> shouldn't they be in mircommon?

libmircommon is "common" between by libmirplatform, libmirclient and libmirserver - it should contain symbols that are used by all three. (There's a follow-up MP that removes some symbols used only by libmirplatform and libmirserver.)

libmirclient is used by libmirserver so why shouldn't it contain symbols shared with the latter?

Practically, the mir_toolkit/event/event.h header obviously belongs in client and is a dependency of the builders so splitting those out into libmircommon would involve some rework.

[Alan Griffiths (alan-griffiths)]

> You don't need to bump the SONAME of mirclient-debug-extension.
...
> I don't think you need to bump mirclient SONAME? The only loss I can see is
> the symbols exposed purely for the tests and PrivateProtobuf, neither of which
> are public. abi-compliance-checker will complain, but will be wrong in this
> case.

I thought that rewriting the symbol maps as I have would require the SONAME bump? As xxx@MIR_CLIENT_8 etc won't resolve?

Am I just wrong or is there an alternative incantation?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2407
http://jenkins.qa.ubuntu.com/job/mir-ci/3227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1224
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1610
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4623
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18876

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3227/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2407
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~alan-griffiths/mir/fix-1415321/+merge/253077/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/3231/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1659
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1614/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1228
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1614
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1614/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4626/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18882

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3231/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

>> You don't need to bump the SONAME of mirclient-debug-extension.
...
>> I don't think you need to bump mirclient SONAME? The only loss I can see is
>> the symbols exposed purely for the tests and PrivateProtobuf, neither of which
>> are public. abi-compliance-checker will complain, but will be wrong in this
>> case.

> I thought that rewriting the symbol maps as I have would require the SONAME bump? As xxx@MIR_CLIENT_8 etc won't resolve?

Rewriting the symbol maps as you had done *would* require the SONAME bump, but as you've now listed all the xxx@MIR_CLIENT_8 symbols in the MIR_CLIENT_8 block they'll all resolve correctly (other than the ones we've always said are private).

Needs fixing: You don't need to postfix all the C symbols with “*”; we do that for the C++ symbols because the parameter signature is a part of the function name in C++. That's obviously not relevant for C symbols, and is potentially dangerous if one of our functions ends up being named a prefix of another one.

Needs fixing: The changelog should no longer document a mirclient ABI bump :)

> libmircommon is "common" between by libmirplatform, libmirclient and libmirserver - it should contain symbols that > are used by all three. (There's a follow-up MP that removes some symbols used only by libmirplatform and
> libmirserver.)

I'm not sure why that is the definition of mircommon; I don't see why symbols shared by mirclient and mirserver shouldn't be in there.

> libmirclient is used by libmirserver so why shouldn't it contain symbols shared with the latter?

Two reasons:
1) I'd ideally like libmirclient to export only a C ABI,
2) I expect in the not too distant future that libmirserver will *not* depend on libmirclient; that it currently does is a strange arrangement forced on us by the nested platform not being loadable.

While I agree it makes sense for symbols shared only between mirserver and mirplatform to be in mirplatform, this is because mirplatform exists only to provide infrastructure for mirserver components. mirclient and mirserver should both be top-level objects.

I won't block on the somewhat philosophial issue of mirserver → mirclient dependency.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

(3) Changing the versions of old-ish symbols from MIR_CLIENT_8 to MIR_CLIENT_8.x I think is an ABI break that will break some existing downstreams. :(

446 +MIR_CLIENT_8.4 {
447 + global:
448 + mir_default_cursor_name;
449 + mir_disabled_cursor_name;
450 + mir_arrow_cursor_name;
451 + mir_busy_cursor_name;
452 + mir_caret_cursor_name;
453 + mir_pointing_hand_cursor_name;
454 + mir_open_hand_cursor_name;
455 + mir_closed_hand_cursor_name;
456 + mir_horizontal_resize_cursor_name;
457 + mir_vertical_resize_cursor_name;
458 + mir_diagonal_resize_bottom_to_top_cursor_name;
459 + mir_diagonal_resize_top_to_bottom_cursor_name;
460 + mir_omnidirectional_resize_cursor_name;
461 + mir_vsplit_resize_cursor_name;
462 + mir_hsplit_resize_cursor_name;
463 +} MIR_CLIENT_8.3;
464 +
465 +MIR_CLIENT_8.5 {
466 + global:
467 + mir_event_get_close_surface_event*;
468 + mir_event_get_input_event*;
469 + mir_event_get_keymap_event*;

(4) Yeah those new wildcards just add a little bit of risk, but no value.

Looks like too much risk of breaking the client ABI still. I vote just resubmit in a simpler form (client ABI 9) after vivid is finalized.

review: Needs Resubmitting

[Alan Griffiths (alan-griffiths)]

> (3) Changing the versions of old-ish symbols from MIR_CLIENT_8 to
> MIR_CLIENT_8.x I think is an ABI break that will break some existing
> downstreams. :(

Yeah, looks like that stopped the CI mako booting.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2410
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~alan-griffiths/mir/fix-1415321/+merge/253077/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/3242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1239
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1625
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1625/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4635
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18901

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3242/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2410
http://jenkins.qa.ubuntu.com/job/mir-ci/3246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1243
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1629
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4638
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18904

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3246/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

I worked a bit on clarifying some of the nested/offscreen interfaces internally, but stopped short of splitting out a new .so (mostly so we don't have the maintenence burden of a new .so, and a new public distinction between "host" (android/mesa) and "guest" (nested/offscreen) "platforms", that only provide a display.). I think it is cleaner if mirclient only exports a c abi too, but I don't think this solution makes the dependency chain any more or less safe than the current status quo. I guess abstain for some more discussion on the MP.

review: Abstain

[Chris Halse Rogers (raof)]

Still not wild on deliberately exporting C++ symobls from mirclient, and not wild about exporting implementation details from mirclient.

I don't think this is the right way to fix the bug, but I don't particularly feel like fixing it the right way myself at the moment, and this isn't going to make it any harder should I later choose to :).

review: Abstain

[Daniel van Vugt (vanvugt)]

ABI break: A bunch of symbols have changed version stanzas:

447 MIR_CLIENT_8.2 {
448 - global:
449 - mir_surface_set_preferred_orientation;
450 - mir_surface_get_preferred_orientation;
451 - mir_surface_spec_set_preferred_orientation;
452 } MIR_CLIENT_8.1;
453
454 MIR_CLIENT_8.3 {
455 - global:
456 - mir_connection_create_spec_for_menu;
457 - mir_connection_create_spec_for_tooltip;
458 - mir_connection_create_spec_for_dialog;
459 + global:
460 mir_connection_platform_operation;
461 } MIR_CLIENT_8.2;

(and beyond in the new stanzas 8.4, 8.5)

As it seems we have to break the client ABI regardless, I think the most sensible solution is wait till post-vivid and lump everything into MIR_CLIENT_9.

review: Needs Resubmitting

[Alan Griffiths (alan-griffiths)]

> ABI break: A bunch of symbols have changed version stanzas:

Nope.

"Note that the script is read top to bottom; wildcards are greedily bound when first encountered, so to avoid surprises you should only have a wildcard in the final stanza."
 - http://unity.ubuntu.com/mir/dso_versioning_guide.html

FWIW That's the surprise I had in -r 2407 (which did cause an ABI break that stopped the CI makos booting).

[Alan Griffiths (alan-griffiths)]

OK. I accept that it would be a reasonable goal to make the symbols from libmirclient C only.

But the existing script also mentioned some internal C++ symbols so I don't feel that blocks this MP which is an improvement on the status quo.

[Alberto Aguirre (albaguirre)]

So it looks like we missed versioning some symbols correctly in trunk/devel (like mir_connection_create_spec_for_input_method, mir_connection_create_spec_for_modal_dialog) for example

http://pastebin.ubuntu.com/10621901/

However it does look like the functions mentioned in the versioned stanzas are indeed versioned correctly:
http://pastebin.ubuntu.com/10622070/
http://pastebin.ubuntu.com/10622077/
http://pastebin.ubuntu.com/10622081/

So we should at least keep those in their respective stanzas.

Regarding exposing C++ symbols and implementation details - that is a pre-existing issue so I would consider that outside the scope of this MP.

@Chris:
>I don't think this is the right way to fix the bug, but I don't particularly feel like fixing >it the right way myself at the moment

Why not? The alternative I see is replicating symbols by wrapping them in the client and versioning them under a MIR_CLIENT_8.x stanza. I guess the advantage there is server code or other places that need them can just link to libmircommon instead of libmirclient.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> So it looks like we missed versioning some symbols correctly in trunk/devel
> (like mir_connection_create_spec_for_input_method,
> mir_connection_create_spec_for_modal_dialog) for example
>
> http://pastebin.ubuntu.com/10621901/
>
> However it does look like the functions mentioned in the versioned stanzas are
> indeed versioned correctly:
> http://pastebin.ubuntu.com/10622070/
> http://pastebin.ubuntu.com/10622077/
> http://pastebin.ubuntu.com/10622081/

OK I'll copy the stanzas from the released libs

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2412
http://jenkins.qa.ubuntu.com/job/mir-ci/3269/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1700/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1699/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1654/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1654/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3269/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2413
http://jenkins.qa.ubuntu.com/job/mir-ci/3272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1703
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1658/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1269
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1269/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1658/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3272/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Looks like we might be getting closer to something ABI safe. Haven't re-examined in detail.
We really need automation to take the guesswork out... :)

review: Abstain

[Alan Griffiths (alan-griffiths)]

> Looking for a way to retrieve the upstream tarball
> Using apt to look for the upstream tarball.
> apt could not find the needed tarball.
> Trying to use get-packaged-orig-source to retrieve needed tarball.
> dh get-packaged-orig-source --parallel --fail-missing
> sh: 1: arm-linux-gnueabihf-gcc-4.9: not found
> dpkg-architecture: warning: couldn't determine gcc system type, falling back to default (native compilation)
> sh: 1: arm-linux-gnueabihf-gcc-4.9: not found

I don't this change could cause this

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2414
http://jenkins.qa.ubuntu.com/job/mir-ci/3278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1275
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1275/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1665
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1665/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4667
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18988

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3278/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

I keep flip-flopping in my head over this MP between abstain (for mirclient having c++ abi, and the current status quo) and approve... It seems like a step toward better abi control though, so I guess approve wins out

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2415
http://jenkins.qa.ubuntu.com/job/mir-ci/3280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1277
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1668
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4670
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18995

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3280/rebuild

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

make abi-check-mirclient reports no compatibility issues with mir/ubuntu

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-06 03:52:41 +0000
+++ debian/changelog	2015-03-19 10:32:29 +0000
@@ -8,7 +8,7 @@
       . TODO: mention more enhancements
     - ABI summary: Servers need rebuilding, but clients do not;
       . Mirclient ABI unchanged at 8
-      . Mircommon ABI unchanged at 3
+      . Mircommon ABI bumped to 4
       . Mirplatform ABI bumped to 7
       . Mirserver ABI bumped to 31  (TODO 30 is in series 0.12)
     - Bug fixes:
 
=== modified file 'debian/control'
--- debian/control	2015-03-12 03:19:52 +0000
+++ debian/control	2015-03-19 10:32:29 +0000
@@ -95,7 +95,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmircommon3 (= ${binary:Version}), 
+Depends: libmircommon4 (= ${binary:Version}), 
          libprotobuf-dev (>= 2.4.1),
          libxkbcommon-dev,
          ${misc:Depends},
@@ -255,7 +255,7 @@
  .
  Contains a tool for stress testing the Mir display server
 
-Package: libmircommon3
+Package: libmircommon4
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 
=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install	2014-10-23 13:29:28 +0000
+++ debian/libmirclient-dev.install	2015-03-19 10:32:29 +0000
@@ -1,3 +1,4 @@
 usr/include/mirclient/mir_toolkit/*.h
+usr/include/mirclient/mir_toolkit/events
 usr/lib/*/pkgconfig/mirclient.pc
 usr/lib/*/libmirclient.so
 
=== renamed file 'debian/libmircommon3.install' => 'debian/libmircommon4.install'
--- debian/libmircommon3.install	2015-01-21 07:34:50 +0000
+++ debian/libmircommon4.install	2015-03-19 10:32:29 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmircommon.so.3
+usr/lib/*/libmircommon.so.4
 
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-03-18 21:26:34 +0000
+++ examples/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -183,8 +183,7 @@
     mircommon
 )
 
-# FIXME: Bug not fixed yet.
-if (MIR_ENABLE_TESTS AND MIR_TEST_CLIENT_ABI)
+if (MIR_ENABLE_TESTS)
   # Regression tests for LP: #1415321
 
   # To see reasons for failure:  ctest -V -R Clients-only-use-client-symbols
@@ -193,9 +192,18 @@
     COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep 'U mir_')"
   )
 
+# We use a slightly weaker version of the test with clang as that generates spurious NEEDED
+if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang")
   # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
   add_test(NAME Clients-only-use-client-ABI
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     COMMAND /bin/sh -c "!(objdump -p .mir_demo_client_* mir_demo_client*  | grep NEEDED | grep libmir | grep -v libmirclient)"
   )
+else()
+  # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
+  add_test(NAME Clients-only-use-client-ABI
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+    COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep @@MIR_)"
+  )
+endif ()
 endif ()
 
=== added directory 'include/client/mir'
=== renamed file 'include/common/mir_toolkit/client_types.h' => 'include/client/mir_toolkit/client_types.h'
=== renamed file 'include/common/mir_toolkit/cursors.h' => 'include/client/mir_toolkit/cursors.h'
--- include/common/mir_toolkit/cursors.h	2014-07-01 16:53:35 +0000
+++ include/client/mir_toolkit/cursors.h	2015-03-19 10:32:29 +0000
@@ -27,6 +27,9 @@
  */
 
 /* This is C code. Not C++. */
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * A special cursor name for use with mir_cursor_configuration_from_name
@@ -110,6 +113,9 @@
  */
 extern char const* const mir_hsplit_resize_cursor_name;
 
+#ifdef __cplusplus
+}
+#endif
 /**@}*/
 
 #endif
 
=== renamed file 'include/common/mir_toolkit/event.h' => 'include/client/mir_toolkit/event.h'
=== renamed directory 'include/common/mir_toolkit/events' => 'include/client/mir_toolkit/events'
=== modified file 'include/client/mir_toolkit/mir_client_library.h'
--- include/client/mir_toolkit/mir_client_library.h	2015-03-06 03:52:41 +0000
+++ include/client/mir_toolkit/mir_client_library.h	2015-03-19 10:32:29 +0000
@@ -24,5 +24,6 @@
 #include <mir_toolkit/mir_buffer_stream.h>
 #include <mir_toolkit/version.h>
 #include <mir_toolkit/mir_platform_message.h>
+#include <mir_toolkit/cursors.h>
 
 #endif /* MIR_CLIENT_LIBRARY_H */
 
=== removed directory 'include/common/mir/input'
=== modified file 'include/common/mir_toolkit/common.h'
--- include/common/mir_toolkit/common.h	2015-01-21 07:34:50 +0000
+++ include/common/mir_toolkit/common.h	2015-03-19 10:32:29 +0000
@@ -21,8 +21,6 @@
 #ifndef MIR_COMMON_H_
 #define MIR_COMMON_H_
 
-#include <mir_toolkit/cursors.h>
-
 /**
  * \addtogroup mir_toolkit
  * @{
 
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2015-03-12 03:19:52 +0000
+++ src/client/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -30,14 +30,20 @@
 add_definitions(-DCLIENT_PLATFORM_VERSION="${MIR_CLIENT_PLATFORM_VERSION}")
 add_definitions(-DMIR_LOGGING_COMPONENT_FALLBACK="mirclient")
 
+set(MIR_CLIENT_SOURCES)
+set(MIR_CLIENT_REFERENCES mircommon)
+
 add_subdirectory(rpc/)
 add_subdirectory(lttng/)
+add_subdirectory(events)
+add_subdirectory(input)
 
 add_library(mirclientobjects OBJECT
 
   client_buffer_depository.cpp
   display_configuration.cpp
   error_connections.cpp
+  event.cpp
   mir_connection.cpp
   mir_connection_api.cpp
   mir_wait_handle.cpp
@@ -63,14 +69,19 @@
   buffer_stream.cpp
   mir_buffer_stream_api.cpp
   default_client_buffer_stream_factory.cpp
+  ${MIR_CLIENT_SOURCES}
 )
 
 # Ensure protobuf C++ headers have been produced before
 # trying to compile mirclientobjects
 add_dependencies(mirclientobjects mirprotobuf)
 
-add_library(mirclient SHARED $<TARGET_OBJECTS:mirclientobjects>)
-add_library(mirclient-static STATIC $<TARGET_OBJECTS:mirclientobjects>)
+add_library(mirclient SHARED $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput>)
+add_library(mirclient-static STATIC $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput>)
+
+target_link_libraries(mirclient
+  ${MIR_CLIENT_REFERENCES}
+)
 
 set_target_properties(mirclient
 
 
=== renamed file 'src/common/event.cpp' => 'src/client/event.cpp'
=== renamed directory 'src/common/events' => 'src/client/events'
=== modified file 'src/client/events/CMakeLists.txt'
--- src/common/events/CMakeLists.txt	2015-01-22 22:56:47 +0000
+++ src/client/events/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -14,8 +14,8 @@
 #
 # Authored by: Robert Carr <[e-mail]>
 
-list(APPEND MIR_COMMON_SOURCES
+list(APPEND MIR_CLIENT_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/event_builders.cpp
 )
 
-set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
+set(MIR_CLIENT_SOURCES ${MIR_CLIENT_SOURCES} PARENT_SCOPE)
 
=== renamed directory 'src/common/input' => 'src/client/input'
=== modified file 'src/client/input/CMakeLists.txt'
--- src/common/input/CMakeLists.txt	2015-03-06 03:52:41 +0000
+++ src/client/input/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -25,22 +25,16 @@
 
 add_library(mirsharedinput OBJECT
   ${ANDROID_SHARED_INPUT_SOURCES}
-  udev_wrapper.cpp
   input_event.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/xkb_mapper.cpp
 )
 
-list(APPEND MIR_COMMON_SOURCES
-  $<TARGET_OBJECTS:mirsharedinput>
-)
-
-# As we put android-input in MIR_COMMON_REFERENCES it ends up linked into
+# As we put android-input in MIR_CLIENT_REFERENCES it ends up linked into
 # libmirserver. But linking into libmircommon fails as it in turn needs
 # mir::mir::terminate_with_current_exception() from mirserver
-list(APPEND MIR_COMMON_REFERENCES android-input)
-
-list(APPEND MIR_COMMON_REFERENCES ${XKBCOMMON_LIBRARIES})
-list(APPEND MIR_COMMON_REFERENCES ${UDEV_LDFLAGS} ${UDEV_LIBRARIES})
-
-set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
-set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
+list(APPEND MIR_CLIENT_REFERENCES android-input)
+
+list(APPEND MIR_CLIENT_REFERENCES ${XKBCOMMON_LIBRARIES})
+
+set(MIR_CLIENT_SOURCES ${MIR_CLIENT_SOURCES} PARENT_SCOPE)
+set(MIR_CLIENT_REFERENCES ${MIR_CLIENT_REFERENCES} PARENT_SCOPE)
 
=== modified file 'src/client/input/input_event.cpp'
--- src/common/input/input_event.cpp	2015-03-06 03:52:41 +0000
+++ src/client/input/input_event.cpp	2015-03-19 10:32:29 +0000
@@ -18,7 +18,7 @@
 
 #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
-#define MIR_LOGGING_COMPONENT "input-event-access"
+#define MIR_LOG_COMPONENT "input-event-access"
 
 #include "mir/event_type_to_string.h"
 #include "mir/log.h"
 
=== modified file 'src/client/mir_cursor_api.cpp'
--- src/client/mir_cursor_api.cpp	2015-03-06 03:52:41 +0000
+++ src/client/mir_cursor_api.cpp	2015-03-19 10:32:29 +0000
@@ -25,21 +25,23 @@
 
 #include <memory>
 
-char const *const mir_default_cursor_name = "default";
-char const *const mir_disabled_cursor_name = "disabled";
-char const* const mir_arrow_cursor_name = "arrow";
-char const* const mir_busy_cursor_name = "busy";
-char const* const mir_caret_cursor_name = "caret";
-char const* const mir_pointing_hand_cursor_name = "pointing-hand";
-char const* const mir_open_hand_cursor_name = "open-hand";
-char const* const mir_closed_hand_cursor_name = "closed-hand";
-char const* const mir_horizontal_resize_cursor_name = "horizontal-resize";
-char const* const mir_vertical_resize_cursor_name = "vertical-resize";
-char const* const mir_diagonal_resize_bottom_to_top_cursor_name = "diagonal-resize-bottom-to-top";
-char const* const mir_diagonal_resize_top_to_bottom_cursor_name = "diagonal-resize-top_to_bottom";
-char const* const mir_omnidirectional_resize_cursor_name = "omnidirectional-resize";
-char const* const mir_vsplit_resize_cursor_name = "vsplit-resize";
-char const* const mir_hsplit_resize_cursor_name = "hsplit-resize";
+
+extern "C" char const *const mir_default_cursor_name = "default";
+extern "C" char const *const mir_disabled_cursor_name = "disabled";
+extern "C" char const* const mir_arrow_cursor_name = "arrow";
+extern "C" char const* const mir_busy_cursor_name = "busy";
+extern "C" char const* const mir_caret_cursor_name = "caret";
+extern "C" char const* const mir_pointing_hand_cursor_name = "pointing-hand";
+extern "C" char const* const mir_open_hand_cursor_name = "open-hand";
+extern "C" char const* const mir_closed_hand_cursor_name = "closed-hand";
+extern "C" char const* const mir_horizontal_resize_cursor_name = "horizontal-resize";
+extern "C" char const* const mir_vertical_resize_cursor_name = "vertical-resize";
+extern "C" char const* const mir_diagonal_resize_bottom_to_top_cursor_name = "diagonal-resize-bottom-to-top";
+extern "C" char const* const mir_diagonal_resize_top_to_bottom_cursor_name = "diagonal-resize-top_to_bottom";
+extern "C" char const* const mir_omnidirectional_resize_cursor_name = "omnidirectional-resize";
+extern "C" char const* const mir_vsplit_resize_cursor_name = "vsplit-resize";
+extern "C" char const* const mir_hsplit_resize_cursor_name = "hsplit-resize";
+
 
 MirCursorConfiguration::MirCursorConfiguration(char const* name) :
     name{name ? name : std::string()}
 
=== modified file 'src/client/symbols-debug.map'
--- src/client/symbols-debug.map	2015-03-06 03:52:41 +0000
+++ src/client/symbols-debug.map	2015-03-19 10:32:29 +0000
@@ -3,11 +3,3 @@
    mir_debug_*;
  local: *;
 };
-
-MIR_CLIENT_8 {
-    local: mir_connection_platform_operation;
-};
-
-MIR_CLIENT_8.3 {
-    local: mir_connection_platform_operation;
-};
 
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-03-06 03:52:41 +0000
+++ src/client/symbols.map	2015-03-19 10:32:29 +0000
@@ -1,46 +1,186 @@
 MIR_CLIENT_8 {
  global:
- mir_connection_platform_operation;
- mir_*;
-  extern "C++" { 
-   # used by PrivateProtobuf
-   mir::client::the_rpc_channel*;
-   
-   # used by test framework - see lp:1349788
-   MirConnection::MirConnection*;
-   MirConnection::connect*;
-   MirConnection::disconnect*;
-   mir::client::DefaultConnectionConfiguration::*;
-   vtable?for?mir::client::DefaultConnectionConfiguration;
-   typeinfo?for?mir::client::DefaultConnectionConfiguration;
-  }; 
+    mir_arrow_cursor_name;
+    mir_busy_cursor_name;
+    mir_caret_cursor_name;
+    mir_closed_hand_cursor_name;
+    mir_connect;
+    mir_connection_api_impl;
+    mir_connection_apply_display_config;
+    mir_connection_create_display_config;
+    mir_connection_create_prompt_session_sync;
+    mir_connection_create_screencast_sync;
+    mir_connection_create_spec_for_input_method;
+    mir_connection_create_spec_for_modal_dialog;
+    mir_connection_create_surface;
+    mir_connection_create_surface_sync;
+    mir_connection_drm_auth_magic;
+    mir_connection_drm_set_gbm_device;
+    mir_connection_get_available_surface_formats;
+    mir_connection_get_display_info;
+    mir_connection_get_egl_native_display;
+    mir_connection_get_error_message;
+    mir_connection_get_platform;
+    mir_connection_is_valid;
+    mir_connection_platform_operation;
+    mir_connection_release;
+    mir_connection_set_display_config_change_callback;
+    mir_connection_set_lifecycle_event_callback;
+    mir_connect_sync;
+    mir_cursor_configuration_destroy;
+    mir_cursor_configuration_from_name;
+    mir_default_cursor_name;
+    mir_diagonal_resize_bottom_to_top_cursor_name;
+    mir_diagonal_resize_top_to_bottom_cursor_name;
+    mir_disabled_cursor_name;
+    mir_display_config_destroy;
+    mir_horizontal_resize_cursor_name;
+    mir_hsplit_resize_cursor_name;
+    mir_omnidirectional_resize_cursor_name;
+    mir_open_hand_cursor_name;
+    mir_platform_message_create;
+    mir_platform_message_get_data;
+    mir_platform_message_get_fds;
+    mir_platform_message_get_opcode;
+    mir_platform_message_release;
+    mir_platform_message_set_data;
+    mir_platform_message_set_fds;
+    mir_pointing_hand_cursor_name;
+    mir_prompt_session_error_message;
+    mir_prompt_session_is_valid;
+    mir_prompt_session_new_fds_for_prompt_providers;
+    mir_prompt_session_release_sync;
+    mir_screencast_egl_native_window;
+    mir_screencast_release_sync;
+    mir_surface_configure_cursor;
+    mir_surface_get_current_buffer;
+    mir_surface_get_dpi;
+    mir_surface_get_egl_native_window;
+    mir_surface_get_error_message;
+    mir_surface_get_focus;
+    mir_surface_get_graphics_region;
+    mir_surface_get_id;
+    mir_surface_get_orientation;
+    mir_surface_get_parameters;
+    mir_surface_get_platform_type;
+    mir_surface_get_state;
+    mir_surface_get_swapinterval;
+    mir_surface_get_type;
+    mir_surface_get_visibility;
+    mir_surface_is_valid;
+    mir_surface_release;
+    mir_surface_release_sync;
+    mir_surface_set_event_handler;
+    mir_surface_set_state;
+    mir_surface_set_swapinterval;
+    mir_surface_set_type;
+    mir_surface_spec_release;
+    mir_surface_swap_buffers;
+    mir_surface_swap_buffers_sync;
+    mir_vertical_resize_cursor_name;
+    mir_vsplit_resize_cursor_name;
+    mir_wait_for;
+    mir_wait_for_one;
  local: *;
 };
-
 MIR_CLIENT_8.1 {
-  global:
+ global:
     mir_connection_create_spec_for_normal_surface;
     mir_surface_create;
     mir_surface_create_sync;
+    mir_surface_spec_set_buffer_usage;
+    mir_surface_spec_set_fullscreen_on_output;
+    mir_surface_spec_set_height;
     mir_surface_spec_set_name;
+    mir_surface_spec_set_pixel_format;
     mir_surface_spec_set_width;
-    mir_surface_spec_set_height;
-    mir_surface_spec_set_pixel_format;
-    mir_surface_spec_set_buffer_usage;
-    mir_surface_spec_set_fullscreen_on_output;
 } MIR_CLIENT_8;
 
 MIR_CLIENT_8.2 {
-  global:
+ global:
+    mir_surface_get_preferred_orientation;
     mir_surface_set_preferred_orientation;
-    mir_surface_get_preferred_orientation;
     mir_surface_spec_set_preferred_orientation;
 } MIR_CLIENT_8.1;
 
 MIR_CLIENT_8.3 {
-  global:
+ global:
+    mir_connection_create_spec_for_dialog;
     mir_connection_create_spec_for_menu;
     mir_connection_create_spec_for_tooltip;
-    mir_connection_create_spec_for_dialog;
     mir_connection_platform_operation;
 } MIR_CLIENT_8.2;
+
+MIR_CLIENT_8.4 {
+ global:
+    mir_default_cursor_name;
+    mir_disabled_cursor_name;
+    mir_arrow_cursor_name;
+    mir_busy_cursor_name;
+    mir_caret_cursor_name;
+    mir_pointing_hand_cursor_name;
+    mir_open_hand_cursor_name;
+    mir_closed_hand_cursor_name;
+    mir_horizontal_resize_cursor_name;
+    mir_vertical_resize_cursor_name;
+    mir_diagonal_resize_bottom_to_top_cursor_name;
+    mir_diagonal_resize_top_to_bottom_cursor_name;
+    mir_omnidirectional_resize_cursor_name;
+    mir_vsplit_resize_cursor_name;
+    mir_hsplit_resize_cursor_name;
+    mir_event_get_close_surface_event;
+    mir_event_get_input_event;
+    mir_event_get_keymap_event;
+    mir_event_get_orientation_event;
+    mir_event_get_prompt_session_event;
+    mir_event_get_resize_event;
+    mir_event_get_surface_event;
+    mir_event_get_type;
+    mir_event_ref;
+    mir_event_unref;
+    mir_input_event_get_device_id;
+    mir_input_event_get_event_time;
+    mir_input_event_get_key_input_event;
+    mir_input_event_get_pointer_input_event;
+    mir_input_event_get_touch_input_event;
+    mir_input_event_get_type;
+    mir_key_input_event_get_action;
+    mir_key_input_event_get_key_code;
+    mir_key_input_event_get_modifiers;
+    mir_key_input_event_get_scan_code;
+    mir_keymap_event_get_rules;
+    mir_orientation_event_get_direction;
+    mir_pointer_input_event_get_action;
+    mir_pointer_input_event_get_axis_value;
+    mir_pointer_input_event_get_button_state;
+    mir_pointer_input_event_get_modifiers;
+    mir_prompt_session_event_get_state;
+    mir_resize_event_get_height;
+    mir_resize_event_get_width;
+    mir_surface_event_get_attribute;
+    mir_surface_event_get_attribute_value;
+    mir_surface_set_swapinterval;
+    mir_surface_swap_buffers;
+    mir_surface_swap_buffers_sync;
+    mir_touch_input_event_get_modifiers;
+    mir_touch_input_event_get_touch_action;
+    mir_touch_input_event_get_touch_axis_value;
+    mir_touch_input_event_get_touch_count;
+    mir_touch_input_event_get_touch_id;
+    mir_touch_input_event_get_touch_tooltype;
+    mir_surface_get_buffer_stream;
+    mir_buffer_stream_get_current_buffer;
+    mir_buffer_stream_get_platform_type;
+    mir_buffer_stream_swap_buffers_sync;
+    mir_screencast_get_buffer_stream;
+    mir_buffer_stream_get_egl_native_window;
+    mir_buffer_stream_get_graphics_region;
+} MIR_CLIENT_8.3;
+
+MIR_CLIENT_DETAIL_8 {
+  global:
+    extern "C++" { 
+      mir::events::make_event*;
+      mir::input::android::Lexicon::translate*;
+    }; 
+};
 
=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2015-03-16 03:39:55 +0000
+++ src/common/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -10,7 +10,6 @@
 
 add_subdirectory(fd)
 add_subdirectory(geometry)
-add_subdirectory(input)
 add_subdirectory(logging)
 add_subdirectory(report/lttng)
 add_subdirectory(env)
@@ -18,12 +17,12 @@
 add_subdirectory(thread)
 add_subdirectory(time)
 add_subdirectory(dispatch)
+add_subdirectory(udev)
 
 list(APPEND MIR_COMMON_SOURCES
   $<TARGET_OBJECTS:mirtime>
   ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
   )
-add_subdirectory(events)
 
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -35,10 +34,6 @@
   ${MIR_GENERATED_INCLUDE_DIRECTORIES}
   PARENT_SCOPE)
 
-list(APPEND MIR_COMMON_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
-)
-
 add_library(mircommon
   SHARED
   ${MIR_COMMON_SOURCES}
@@ -49,7 +44,7 @@
 )
 
 # TODO we need a place to manage ABI and related versioning but use this as placeholder
-set(MIRCOMMON_ABI 3)
+set(MIRCOMMON_ABI 4)
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(mircommon
 
=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
--- src/common/sharedlibrary/CMakeLists.txt	2015-03-06 03:52:41 +0000
+++ src/common/sharedlibrary/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -24,7 +24,10 @@
   $<TARGET_OBJECTS:mirsharedsharedlibrary>
 )
 
-list(APPEND MIR_COMMON_REFERENCES dl)
+list(APPEND MIR_COMMON_REFERENCES 
+  dl
+  ${Boost_LIBRARIES}
+)
 
 set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
 
=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2015-03-16 03:39:55 +0000
+++ src/common/symbols.map	2015-03-19 10:32:29 +0000
@@ -1,20 +1,32 @@
 
-MIR_COMMON_3 {
+MIR_COMMON_4 {
  global: mir_*;
   extern "C++" {
 # The following symbols come from running a script over the generated docs. Vis:
 # ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: /    /" | sort  
-    mir_arrow_cursor_name*;
-    mir_busy_cursor_name*;
-    mir_caret_cursor_name*;
-    mir_closed_hand_cursor_name*;
-    mir_default_cursor_name*;
-    mir_diagonal_resize_bottom_to_top_cursor_name*;
-    mir_diagonal_resize_top_to_bottom_cursor_name*;
-    mir_disabled_cursor_name*;
+    mir::detail::RefCountedLibrary::operator*;
+    mir::detail::RefCountedLibrary::?RefCountedLibrary*;
+    mir::detail::RefCountedLibrary::RefCountedLibrary*;
+    mir::dispatch::Dispatchable::?Dispatchable*;
+    mir::dispatch::Dispatchable::Dispatchable*;
+    mir::dispatch::Dispatchable::operator*;
+    mir::dispatch::MultiplexingDispatchable::add_watch*;
+    mir::dispatch::MultiplexingDispatchable::dispatch*;
+    mir::dispatch::MultiplexingDispatchable::?MultiplexingDispatchable*;
+    mir::dispatch::MultiplexingDispatchable::MultiplexingDispatchable*;
+    mir::dispatch::MultiplexingDispatchable::operator*;
+    mir::dispatch::MultiplexingDispatchable::relevant_events*;
+    mir::dispatch::MultiplexingDispatchable::remove_watch*;
+    mir::dispatch::MultiplexingDispatchable::watch_fd*;
+    mir::dispatch::SimpleDispatchThread::?SimpleDispatchThread*;
+    mir::dispatch::SimpleDispatchThread::SimpleDispatchThread*;
     mir::Fd::Fd*;
     mir::Fd::invalid*;
     mir::Fd::operator*;
+    mir::geometry::Displacement::Displacement*;
+    mir::geometry::Displacement::operator*;
+    mir::geometry::Length::Length*;
+    mir::geometry::Length::operator*;
     mir::geometry::operator*;
     mir::geometry::Point::operator*;
     mir::geometry::Point::Point*;
@@ -37,120 +49,53 @@
     mir::geometry::Rectangle::top_right*;
     mir::geometry::Size::operator*;
     mir::geometry::Size::Size*;
-    mir_horizontal_resize_cursor_name*;
-    mir_hsplit_resize_cursor_name*;
-    mir::input::receiver::android::AndroidInputPlatform::?AndroidInputPlatform*;
-    mir::input::receiver::android::AndroidInputPlatform::AndroidInputPlatform*;
-    mir::input::receiver::android::AndroidInputPlatform::create_input_thread*;
-    mir::input::receiver::android::AndroidInputPlatform::operator*;
-    mir::input::receiver::android::InputReceiver::fd*;
-    mir::input::receiver::android::InputReceiver::?InputReceiver*;
-    mir::input::receiver::android::InputReceiver::InputReceiver*;
-    mir::input::receiver::android::InputReceiver::next_event*;
-    mir::input::receiver::android::InputReceiver::operator*;
-    mir::input::receiver::android::InputReceiverThread::?InputReceiverThread*;
-    mir::input::receiver::android::InputReceiverThread::InputReceiverThread*;
-    mir::input::receiver::android::InputReceiverThread::join*;
-    mir::input::receiver::android::InputReceiverThread::operator*;
-    mir::input::receiver::android::InputReceiverThread::start*;
-    mir::input::receiver::android::InputReceiverThread::stop*;
-    mir::input::receiver::android::InputReceiver::wake*;
-    mir::input::receiver::InputPlatform::create*;
-    mir::input::receiver::InputPlatform::create_input_thread*;
-    mir::input::receiver::InputPlatform::InputPlatform*;
-    mir::input::receiver::InputPlatform::operator*;
-    mir::input::receiver::InputReceiverThread::InputReceiverThread*;
-    mir::input::receiver::InputReceiverThread::join*;
-    mir::input::receiver::InputReceiverThread::operator*;
-    mir::input::receiver::InputReceiverThread::start*;
-    mir::input::receiver::InputReceiverThread::stop*;
-    mir_omnidirectional_resize_cursor_name*;
-    mir_open_hand_cursor_name*;
-    mir_pointing_hand_cursor_name*;
-    mir::time::Clock::?Clock*;
-    mir::time::Clock::Clock*;
-    mir::time::Clock::sample*;
-    mir_vertical_resize_cursor_name*;
-    mir_vsplit_resize_cursor_name*;
-    non-virtual?thunk?to?mir::input::receiver::android::AndroidInputPlatform::?AndroidInputPlatform*;
-    non-virtual?thunk?to?mir::input::receiver::android::AndroidInputPlatform::create_input_thread*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiver::?InputReceiver*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiver::next_event*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiverThread::?InputReceiverThread*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiverThread::join*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiverThread::start*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiverThread::stop*;
-    non-virtual?thunk?to?mir::input::receiver::android::InputReceiver::wake*;
-    non-virtual?thunk?to?mir::time::Clock::?Clock*;
+    mir::log*;
+    mir::logging::log*;
+    mir::logging::Logger::?Logger*;
+    mir::logging::Logger::Logger*;
+    mir::logging::Logger::operator*;
+    mir::logging::set_logger*;
+    non-virtual?thunk?to?mir::dispatch::Dispatchable::?Dispatchable*;
+    non-virtual?thunk?to?mir::dispatch::MultiplexingDispatchable::dispatch*;
+    non-virtual?thunk?to?mir::dispatch::MultiplexingDispatchable::?MultiplexingDispatchable*;
+    non-virtual?thunk?to?mir::dispatch::MultiplexingDispatchable::relevant_events*;
+    non-virtual?thunk?to?mir::dispatch::MultiplexingDispatchable::watch_fd*;
+    non-virtual?thunk?to?mir::logging::Logger::?Logger*;
     typeinfo?for?MirBufferPackage;
-    typeinfo?for?MirDisplayCard;
-    typeinfo?for?MirDisplayConfiguration;
-    typeinfo?for?MirDisplayInfo;
-    typeinfo?for?MirDisplayMode;
-    typeinfo?for?MirDisplayOutput;
-    typeinfo?for?MirEventDelegate;
+    typeinfo?for?mir::detail::RefCountedLibrary;
+    typeinfo?for?mir::dispatch::Dispatchable;
+    typeinfo?for?mir::dispatch::MultiplexingDispatchable;
+    typeinfo?for?mir::dispatch::SimpleDispatchThread;
     typeinfo?for?mir::Fd;
+    typeinfo?for?mir::geometry::Displacement;
+    typeinfo?for?mir::geometry::Length;
     typeinfo?for?mir::geometry::Point;
     typeinfo?for?mir::geometry::Rectangle;
     typeinfo?for?mir::geometry::Rectangles;
     typeinfo?for?mir::geometry::Size;
-    typeinfo?for?MirGraphicsRegion;
-    typeinfo?for?mir::input::receiver::android::AndroidInputPlatform;
-    typeinfo?for?mir::input::receiver::android::InputReceiver;
-    typeinfo?for?mir::input::receiver::android::InputReceiverThread;
-    typeinfo?for?mir::input::receiver::InputPlatform;
-    typeinfo?for?mir::input::receiver::InputReceiverThread;
     typeinfo?for?mir::IntOwnedFd;
-    typeinfo?for?MirKeyEvent;
-    typeinfo?for?MirMotionEvent;
-    typeinfo?for?MirMotionPointer;
-    typeinfo?for?MirOrientationEvent;
-    typeinfo?for?MirPlatformPackage;
-    typeinfo?for?MirPromptSessionEvent;
-    typeinfo?for?MirRectangle;
-    typeinfo?for?MirResizeEvent;
-    typeinfo?for?MirScreencastParameters;
-    typeinfo?for?MirSurfaceEvent;
-    typeinfo?for?MirSurfaceParameters;
-    typeinfo?for?mir::time::Clock;
+    typeinfo?for?mir::logging::Logger;
     vtable?for?MirBufferPackage;
-    vtable?for?MirDisplayCard;
-    vtable?for?MirDisplayConfiguration;
-    vtable?for?MirDisplayInfo;
-    vtable?for?MirDisplayMode;
-    vtable?for?MirDisplayOutput;
-    vtable?for?MirEventDelegate;
+    vtable?for?mir::detail::RefCountedLibrary;
+    vtable?for?mir::dispatch::Dispatchable;
+    vtable?for?mir::dispatch::MultiplexingDispatchable;
+    vtable?for?mir::dispatch::SimpleDispatchThread;
     vtable?for?mir::Fd;
+    vtable?for?mir::geometry::Displacement;
+    vtable?for?mir::geometry::Length;
     vtable?for?mir::geometry::Point;
     vtable?for?mir::geometry::Rectangle;
     vtable?for?mir::geometry::Rectangles;
     vtable?for?mir::geometry::Size;
-    vtable?for?MirGraphicsRegion;
-    vtable?for?mir::input::receiver::android::AndroidInputPlatform;
-    vtable?for?mir::input::receiver::android::InputReceiver;
-    vtable?for?mir::input::receiver::android::InputReceiverThread;
-    vtable?for?mir::input::receiver::InputPlatform;
-    vtable?for?mir::input::receiver::InputReceiverThread;
     vtable?for?mir::IntOwnedFd;
-    vtable?for?MirKeyEvent;
-    vtable?for?MirMotionEvent;
-    vtable?for?MirMotionPointer;
-    vtable?for?MirOrientationEvent;
-    vtable?for?MirPlatformPackage;
-    vtable?for?MirPromptSessionEvent;
-    vtable?for?MirRectangle;
-    vtable?for?MirResizeEvent;
-    vtable?for?MirScreencastParameters;
-    vtable?for?MirSurfaceEvent;
-    vtable?for?MirSurfaceParameters;
+    vtable?for?mir::logging::Logger;
     
     # These symbols are supposed to be "private" (they're under src/include)
     # but they are used by libmirplatform, libmirclient or libmirserver
     mir::default_server_socket;
-    mir::input::android::Lexicon::translate*;
+    mir::libraries_for_path*;
     mir::logging::input_timestamp*;
     mir::logging::log*;
-    mir::logging::set_logger*;
     mir::logging::SharedLibraryProberReport::SharedLibraryProberReport*;
     mir::RecursiveReadLock::?RecursiveReadLock*;
     mir::RecursiveReadLock::RecursiveReadLock*;
@@ -199,63 +144,3 @@
   };
  local: *;
 };
-
-MIR_COMMON_3.1 {
-  global:
-    extern "C++" {
-      mir_event_get*;
-      mir_event_get*;
-      mir_input_event_get*;
-      mir_key_input_event_get*;
-      mir_touch_input_event_get*;
-      mir::log*char*;
-      mir::logv*;
-      mir::libraries_for_path*;
-    };
-} MIR_COMMON_3;
-
-MIR_COMMON_3.2 {
-  global:
-    extern "C++" {
-      mir::dispatch::SimpleDispatchThread::SimpleDispatchThread*;
-      mir::dispatch::SimpleDispatchThread::?SimpleDispatchThread*;
-      typeinfo?for?mir::dispatch::SimpleDispatchThread;
-      vtable?for?mir::dispatch::SimpleDispatchThread;
-
-      mir::events::*;
-      mir::input::receiver::XKBMapper::XKBMapper*;
-      mir::input::receiver::XKBMapper::XKBMapper*;        
-      mir::input::receiver::XKBMapper::set_rules*;
-      typeinfo?for?mir::input::receiver::XKBMapper;
-      vtable?for?mir::input::receiver::XKBMapper;
-
-      mir::dispatch::MultiplexingDispatchable::MultiplexingDispatchable*;
-      mir::dispatch::MultiplexingDispatchable::?MultiplexingDispatchable*;
-      mir::dispatch::MultiplexingDispatchable::watch_fd*;
-      mir::dispatch::MultiplexingDispatchable::dispatch*;
-      mir::dispatch::MultiplexingDispatchable::relevant_events*;
-      mir::dispatch::MultiplexingDispatchable::add_watch*;
-      mir::dispatch::MultiplexingDispatchable::remove_watch*;
-
-      typeinfo?for?mir::dispatch::MultiplexingDispatchable;
-      vtable?for?mir::dispatch::MultiplexingDispatchable;
-
-      mir::dispatch::ActionQueue::ActionQueue*;
-      mir::dispatch::ActionQueue::?ActionQueue*;
-      mir::dispatch::ActionQueue::watch_fd*;
-      mir::dispatch::ActionQueue::dispatch*;
-      mir::dispatch::ActionQueue::relevant_events*;
-      mir::dispatch::ActionQueue::enqueue*;
-
-      typeinfo?for?mir::dispatch::ActionQueue;
-      vtable?for?mir::dispatch::ActionQueue;
-
-      mir::detail::RefCountedLibrary::operator*;
-      mir::detail::RefCountedLibrary::?RefCountedLibrary*;
-      mir::detail::RefCountedLibrary::RefCountedLibrary*;
-      vtable?for?mir::detail::RefCountedLibrary;
-      typeinfo?for?mir::detail::RefCountedLibrary;
-
-      mir::events::*
-    };
-} MIR_COMMON_3.1;
 
=== added directory 'src/common/udev'
=== added file 'src/common/udev/CMakeLists.txt'
--- src/common/udev/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/common/udev/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -0,0 +1,8 @@
+list(APPEND MIR_COMMON_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/udev_wrapper.cpp
+)
+
+list(APPEND MIR_COMMON_REFERENCES ${UDEV_LDFLAGS} ${UDEV_LIBRARIES})
+
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
+set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
 \ No newline at end of file
 
=== renamed file 'src/common/input/udev_wrapper.cpp' => 'src/common/udev/udev_wrapper.cpp'
=== renamed directory 'include/common/mir/events' => 'src/include/client/mir/events'
=== added directory 'src/include/client/mir/input'
=== renamed file 'include/common/mir/input/input_platform.h' => 'src/include/client/mir/input/input_platform.h'
=== modified file 'src/include/common/mir/logging/input_timestamp.h'
--- src/include/common/mir/logging/input_timestamp.h	2015-03-06 03:52:41 +0000
+++ src/include/common/mir/logging/input_timestamp.h	2015-03-19 10:32:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -19,10 +19,6 @@
 #ifndef MIR_LOGGING_INPUT_TIMESTAMP_H_
 #define MIR_LOGGING_INPUT_TIMESTAMP_H_
 
-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
-
-#include "mir_toolkit/event.h"
-
 #include <string>
 #include <chrono>
 
 
=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2015-03-06 03:52:41 +0000
+++ src/server/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -5,8 +5,10 @@
 
 include_directories(
   ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/include/client
+  ${PROJECT_SOURCE_DIR}/include/server
   ${PROJECT_SOURCE_DIR}/src/include/platform
-  ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/src/include/client
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${GLIB_INCLUDE_DIRS}
 )
 
=== modified file 'src/server/graphics/nested/CMakeLists.txt'
--- src/server/graphics/nested/CMakeLists.txt	2015-01-21 07:34:50 +0000
+++ src/server/graphics/nested/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -1,7 +1,3 @@
-include_directories(
-    ${PROJECT_SOURCE_DIR}/include/client
-)
-
 add_library(
   mirnestedgraphics OBJECT
 
 
=== modified file 'src/server/input/default_configuration.cpp'
--- src/server/input/default_configuration.cpp	2015-03-18 18:48:02 +0000
+++ src/server/input/default_configuration.cpp	2015-03-19 10:32:29 +0000
@@ -51,6 +51,8 @@
 #include "mir/report/legacy_input_report.h"
 #include "mir/main_loop.h"
 
+#include "mir_toolkit/cursors.h"
+
 #include <InputDispatcher.h>
 #include <EventHub.h>
 #include <InputReader.h>
 
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2015-03-16 03:39:55 +0000
+++ tests/integration-tests/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -69,7 +69,6 @@
   mir_integration_tests
   ${INTEGRATION_TESTS_SRCS}
   ${MIR_SERVER_OBJECTS}
-  $<TARGET_OBJECTS:mirclientobjects>
   ${MIR_PLATFORM_OBJECTS}
   ${MIR_COMMON_OBJECTS}
 )
@@ -87,7 +86,7 @@
   mir-test-framework
   mir-test-doubles
   mirclient-debug-extension
-
+  mirclient-static
   mirdraw
   mirclientrpc
   mirclientlttngstatic
 
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-03-06 03:52:41 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-03-19 10:32:29 +0000
@@ -82,7 +82,6 @@
 mir_add_wrapped_executable(mir_unit_tests
   ${UNIT_TEST_SOURCES}
   ${MIR_SERVER_OBJECTS}
-  $<TARGET_OBJECTS:mirclientobjects>
   ${MIR_PLATFORM_OBJECTS}
   ${MIR_COMMON_OBJECTS}
 )
@@ -100,6 +99,7 @@
   mirclientrpc
   mirclientlttngstatic
   demo-shell
+  mirclient-static
   mircommon
 
   mir-test
@@ -130,6 +130,7 @@
   ${MIR_PLATFORM_REFERENCES}
   ${MIR_COMMON_REFERENCES}
   ${MIR_SERVER_REFERENCES}
+  ${XKBCOMMON_LIBRARIES}
 )
 
 if (MIR_BUILD_PLATFORM_ANDROID)
 
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2015-03-06 03:52:41 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2015-03-19 10:32:29 +0000
@@ -18,7 +18,7 @@
 
 #define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
-#include "src/common/input/android/android_input_receiver.h"
+#include "src/client/input/android/android_input_receiver.h"
 #include "mir/input/null_input_receiver_report.h"
 #include "mir/input/xkb_mapper.h"
 #include "mir_toolkit/event.h"
 
=== modified file 'tests/unit-tests/input/test_cursor_controller.cpp'
--- tests/unit-tests/input/test_cursor_controller.cpp	2015-03-12 03:19:52 +0000
+++ tests/unit-tests/input/test_cursor_controller.cpp	2015-03-19 10:32:29 +0000
@@ -27,6 +27,7 @@
 #include "mir/graphics/cursor.h"
 
 #include "mir_toolkit/common.h"
+#include "mir_toolkit/cursors.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/stub_scene_surface.h"
 
=== modified file 'tests/unit-tests/input/test_xcursor_loader.cpp'
--- tests/unit-tests/input/test_xcursor_loader.cpp	2015-01-21 07:34:50 +0000
+++ tests/unit-tests/input/test_xcursor_loader.cpp	2015-03-19 10:32:29 +0000
@@ -22,6 +22,7 @@
 #include "mir_test_framework/executable_path.h"
 
 #include <mir_toolkit/common.h>
+#include <mir_toolkit/cursors.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>