Merge lp:~vanvugt/mir/server42 into lp:mir

[Daniel van Vugt]

Bump server ABI to 42

Just a wild stab at LP: #1616291

[Daniel van Vugt (vanvugt)]

I don't expect this to work, so ignore it unless it does.

review: Disapprove

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3667
https://mir-jenkins.ubuntu.com/job/mir-ci/1514/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1894/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1954
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1945
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1945
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1945
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1918
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1918
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1918/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1918/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1918/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1918
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1918
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1918/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1514/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1616312 and the usual krillin failures...

04:00:25 Triggering device-runtests-mir ? krillin
04:35:27 device-runtests-mir ? krillin completed with result ABORTED
04:35:27 Finished: ABORTED

[lp:~vanvugt/mir/server42]

3668. By Daniel van Vugt on 2016-08-24

Again please

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3668
https://mir-jenkins.ubuntu.com/job/mir-ci/1515/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1895/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1955
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1946
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1946
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1946
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1919/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1919/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1919/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1515/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Now just seeing (here and elsewhere):

06:06:38 Triggering device-runtests-mir ? krillin
06:36:02 Configuration device-runtests-mir ? krillin is still in the queue: Waiting for next available executor on krillin-01
06:41:39 device-runtests-mir ? krillin completed with result ABORTED
06:41:40 Finished: ABORTED

Unmerged revisions

3668. By Daniel van Vugt on 2016-08-24

Again please

3667. By Daniel van Vugt on 2016-08-24

Try this

=== modified file 'debian/control'
--- debian/control	2016-08-01 14:43:19 +0000
+++ debian/control	2016-08-24 05:42:49 +0000
@@ -68,7 +68,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver41
+Package: libmirserver42
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -134,7 +134,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver41 (= ${binary:Version}),
+Depends: libmirserver42 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver41.install' => 'debian/libmirserver42.install'
--- debian/libmirserver41.install	2016-06-30 11:36:23 +0000
+++ debian/libmirserver42.install	2016-08-24 05:42:49 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.41
+usr/lib/*/libmirserver.so.42

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2016-08-08 03:22:02 +0000
+++ src/server/CMakeLists.txt	2016-08-24 05:42:49 +0000
@@ -124,7 +124,7 @@
   ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
 )
 
-set(MIRSERVER_ABI 41) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 42) # Be sure to increment MIR_VERSION_MINOR at the same time
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(