Merge lp:~vanvugt/mir/public-builders into lp:mir

[Daniel van Vugt]

Republish a missing header and missing symbol that is used by both
QtMir and USC (tests), but got lost in Mir r2408. This fixes build
failures for both QtMir and USC. (LP: #1436212)

[Alan Griffiths (alan-griffiths)]

There are no acceptance tests for functionality supported by this header.

Is this an omission?

Or should downstream not rely on this header?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

OK, it does look as though this is genuinely useful for writing downstream tests.

But it needs adding to libmirclient-dev.install (or, possibly better, to a new testing package)

I've logged lp:1436315 for the missing acceptance tests.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2423
http://jenkins.qa.ubuntu.com/job/mir-ci/3359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1813/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1763/console

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

+1

review: Approve

[Kevin DuBois (kdub)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1832
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1783/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1783/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install	2015-03-20 09:27:53 +0000
+++ debian/libmirclient-dev.install	2015-03-26 04:13:20 +0000
@@ -1,4 +1,5 @@
 usr/include/mirclient/mir_toolkit/*.h
+usr/include/mirclient/mir/events/*.h
 usr/include/mirclient/mir_toolkit/events
 usr/lib/*/pkgconfig/mirclient.pc
 usr/lib/*/libmirclient.so
 
=== renamed directory 'src/include/client/mir/events' => 'include/client/mir/events'
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2015-03-24 16:02:48 +0000
+++ src/client/CMakeLists.txt	2015-03-26 04:13:20 +0000
@@ -110,6 +110,7 @@
 
 install(
   DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit
+            ${CMAKE_SOURCE_DIR}/include/client/mir
   DESTINATION "include/mirclient"
 )
 
 
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-03-24 16:02:48 +0000
+++ src/client/symbols.map	2015-03-26 04:13:20 +0000
@@ -181,6 +181,7 @@
   global:
     extern "C++" { 
       mir::events::make_event*;
+      mir::events::add_touch*;
       mir::input::android::Lexicon::translate*;
     }; 
 };