Merge lp:~alan-griffiths/mir/experimenting-with-ci2 into lp:mir

[Alan Griffiths]

*EXPERIMENT WITH CI* - don't bother reviewing

*EXPERIMENT WITH CI* - don't bother reviewing

In https://code.launchpad.net/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync/+merge/226177 things started failing on mako when I bumped the client ABI/so number.

So testing whether that is the problem being seen on that branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1769
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/934
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/926/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/663
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/663/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/661
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3022/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2065/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9755

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2142/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1769. By Alan Griffiths on 2014-07-12

Bump client ABI

=== modified file 'debian/control'
--- debian/control	2014-07-11 03:33:03 +0000
+++ debian/control	2014-07-12 19:58:36 +0000
@@ -166,7 +166,7 @@
  .
  Contains header files required to build Mir servers.
 
-Package: libmirclient8
+Package: libmirclient9
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -186,7 +186,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirclient8 (= ${binary:Version}),
+Depends: libmirclient9 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          ${misc:Depends},

=== renamed file 'debian/libmirclient8.install' => 'debian/libmirclient9.install'
--- debian/libmirclient8.install	2014-06-27 06:15:32 +0000
+++ debian/libmirclient9.install	2014-07-12 19:58:36 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirclient.so.8
+usr/lib/*/libmirclient.so.9

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-06-25 10:19:36 +0000
+++ src/client/CMakeLists.txt	2014-07-12 19:58:36 +0000
@@ -59,7 +59,7 @@
   ${CLIENT_SOURCES}
 )
 
-set(MIRCLIENT_ABI 8)
+set(MIRCLIENT_ABI 9)
 
 set_target_properties(
   mirclient