Merge lp:~afrantzis/mir/versioned-platform-libraries-plus-server-abi-bump into lp:mir

[Alexandros Frantzis]

platforms: Use the ABI version in platform library names and packages + server ABI bump for testing CI

platforms: Use the ABI version in platform library names and packages + server ABI bump for testing CI

[Alexandros Frantzis (afrantzis)]

Do not merge. Only for testing (for now at least).

review: Needs Fixing

[lp:~afrantzis/mir/versioned-platform-libraries-plus-server-abi-bump]

2334. By Alexandros Frantzis on 2015-02-20

Bump CI

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2334
http://jenkins.qa.ubuntu.com/job/mir-ci/3029/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1026
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1026/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1325
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4354
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18237

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

review: Approve (continuous-integration)

Unmerged revisions

2334. By Alexandros Frantzis on 2015-02-20

Bump CI

2333. By Alexandros Frantzis on 2015-02-20

Bump mirserver ABI to 30

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-19 13:21:15 +0000
+++ CMakeLists.txt	2015-02-20 13:44:24 +0000
@@ -27,7 +27,7 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 12) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_MINOR 13) # This should change at least with every MIRSERVER_ABI
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})

=== modified file 'debian/control'
--- debian/control	2015-02-20 13:44:24 +0000
+++ debian/control	2015-02-20 13:44:24 +0000
@@ -61,7 +61,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver29
+Package: libmirserver30
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -127,7 +127,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver29 (= ${binary:Version}),
+Depends: libmirserver30 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver29.install' => 'debian/libmirserver30.install'
--- debian/libmirserver29.install	2015-02-19 10:37:47 +0000
+++ debian/libmirserver30.install	2015-02-20 13:44:24 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.29
+usr/lib/*/libmirserver.so.30

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2015-02-19 13:21:15 +0000
+++ src/server/CMakeLists.txt	2015-02-20 13:44:24 +0000
@@ -106,7 +106,7 @@
   ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
 )
 
-set(MIRSERVER_ABI 29) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 30) # Be sure to increment MIR_VERSION_MINOR at the same time
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(

=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2015-02-19 10:43:31 +0000
+++ src/server/symbols.map	2015-02-20 13:44:24 +0000
@@ -1,4 +1,4 @@
-MIR_SERVER_29 {
+MIR_SERVER_30 {
  global:
   extern "C++" {
 # Symbols not yet picked up by script
@@ -226,6 +226,7 @@
     mir::scene::SurfaceCoordinator::operator*;
     mir::scene::SurfaceCoordinator::raise*;
     mir::scene::SurfaceCoordinator::remove_surface*;
+    mir::scene::SurfaceCoordinator::surface_at*;
     mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
     mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
     mir::scene::SurfaceCreationParameters::of_buffer_usage*;
@@ -735,9 +736,3 @@
   };
  local: *;
 };
-
-MIR_SERVER_29.1 {
-  global:
-    mir::scene::SurfaceCoordinator::surface_at*;
-  local: *;
-} MIR_SERVER_29;