Merge lp:~vanvugt/mir/server-abi-16 into lp:mir

[Daniel van Vugt]

Bump libmirserver ABI to 16

We have proposals in progress that will necessitate a server ABI bump, but don't do it themselves. So do it separately.

P.S. Please defer top approval of this one until an MP actually requiring it has landed. There's a small chance Mir 0.1.6 will got out without any of them, and so this change wouldn't be needed either.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1401
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/942
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/537/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/603
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/610
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/538
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/538/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/515/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4024

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Failing on bug 1281145, not related to this proposal.

[Alan Griffiths (alan-griffiths)]

OK

[Alan Griffiths (alan-griffiths)]

> OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1401
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/881/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/611
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/618
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/618/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/550
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/550/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/526
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4038

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-02-14 09:27:02 +0000
+++ debian/control	2014-02-18 03:42:51 +0000
@@ -70,7 +70,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver15
+Package: libmirserver16
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -116,7 +116,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver15 (= ${binary:Version}),
+Depends: libmirserver16 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver15.install' => 'debian/libmirserver16.install'
--- debian/libmirserver15.install	2014-02-06 17:55:08 +0000
+++ debian/libmirserver16.install	2014-02-18 03:42:51 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.15
+usr/lib/*/libmirserver.so.16

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-02-07 15:38:52 +0000
+++ src/server/CMakeLists.txt	2014-02-18 03:42:51 +0000
@@ -94,7 +94,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 15)
+set(MIRSERVER_ABI 16)
 
 set_target_properties(
   mirserver