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

[Daniel van Vugt]

Bump MIRSERVER_ABI to 25. Since branching 0.6 we've broken the server ABI
by public header changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1833
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/869
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/870
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/176
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2350
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11182

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Since we haven't released 0.6, and due to traincon-0, I'd like to resync 0.6 with devel.

Release landing is a time-consuming process and we fight with other silos to land our ABI breaking changes (e.g. qtmir is in 3 silos landings for which have to be serialized). So I'd like to add as much content as possible, before we have actually gotten to a point where we have tested and ready to land the release. Once we have done comprehensive testing, it's a different story, but we 're not there yet. Currently, we will need to rebuild (and test) due to other landings that will take place before Mir lands.

Thanks.

review: Disapprove

[Daniel van Vugt (vanvugt)]

Verified lp:mir/0.6 r1840 just got devel r1831 merged into it. That means we're redefining what "ABI 24" means to be what's in devel up to r1831. So this proposal doesn't need to land right now. It will be needed after the _next_ server ABI break though.

review: Needs Resubmitting

[Cemil Azizoglu (cemil-azizoglu)]

Yes we'll need this after the next ABI break (and after the release is over).

review: Needs Resubmitting

Unmerged revisions

1833. By Daniel van Vugt on 2014-08-08

Remember the contents of debian/libmirserver25.install

1832. By Daniel van Vugt on 2014-08-08

Bump MIRSERVER_ABI to 25. Since branching 0.6 we've broken the server ABI
by public header changes.

=== modified file 'debian/control'
--- debian/control	2014-08-07 08:43:25 +0000
+++ debian/control	2014-08-08 04:06:58 +0000
@@ -44,7 +44,7 @@
 # just go ahead. ~mir-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~mir-team/mir/trunk
 
-Package: libmirserver24
+Package: libmirserver25
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -141,7 +141,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver24 (= ${binary:Version}),
+Depends: libmirserver25 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
 
=== renamed file 'debian/libmirserver24.install' => 'debian/libmirserver25.install'
--- debian/libmirserver24.install	2014-07-30 15:25:54 +0000
+++ debian/libmirserver25.install	2014-08-08 04:06:58 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.24
+usr/lib/*/libmirserver.so.25
 
=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-08-07 08:43:42 +0000
+++ src/server/CMakeLists.txt	2014-08-08 04:06:58 +0000
@@ -79,7 +79,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 24) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 25) # Be sure to increment MIR_VERSION_MINOR at the same time
 
 set_target_properties(
   mirserver