Merge lp:~vanvugt/mir/fix-1388686 into lp:mir

[Daniel van Vugt]

Remind users of libmir{client,server} to go looking for symbols
in the new libmirprotobuf too (LP: #1388686)

Fixes FTBFS in both unity-system-compositor and qtmir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2021
http://jenkins.qa.ubuntu.com/job/mir-ci/1968/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/313
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1201
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3238
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15323

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Yep

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/807/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2334
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2344/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-autolanding/77
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-autolanding/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1206
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3242
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15333

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> The following tests FAILED:
> 34 - mir_acceptance_tests.TestClientInput.* (Failed)

Looks unrelated. Reapproving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/client/mirclient.pc.in'
--- src/client/mirclient.pc.in	2014-10-27 22:31:16 +0000
+++ src/client/mirclient.pc.in	2014-11-03 04:34:55 +0000
@@ -9,5 +9,5 @@
 Description: Mir client library
 Version: @MIR_VERSION@
 Requires.private: protobuf >= 2.4.1
-Libs: -L${libdir} -lmirclient
+Libs: -L${libdir} -lmirclient -lmirprotobuf
 Cflags: -I${includedir} -I${common_includedir} 

=== modified file 'src/server/mirserver.pc.in'
--- src/server/mirserver.pc.in	2014-10-01 06:25:56 +0000
+++ src/server/mirserver.pc.in	2014-11-03 04:34:55 +0000
@@ -8,5 +8,5 @@
 Version: @MIR_VERSION@
 Requires.private: mirclient
 Requires: mirplatform
-Libs: -L@LIBDIR@ -lmirserver
+Libs: -L@LIBDIR@ -lmirserver -lmirprotobuf
 Cflags: -I@INCLUDEDIR@