Mir

Merge lp:~andreas-pokorny/mir/bump-platform-to-5 into lp:mir

  1. bump-platform-to-5
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3202
Proposed branch: lp:~andreas-pokorny/mir/bump-platform-to-5
Merge into: lp:mir
Diff against target: 52 lines (+6/-6)
3 files modified
debian/control (+3/-3)
debian/mir-platform-input-evdev5.install (+1/-1)
src/platforms/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/bump-platform-to-5
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Daniel van Vugt Approve
Review via email: mp+280590@code.launchpad.net

Commit message

bump input platform abi number

Description of the change

bumps input platform abi to ver 5

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3192
http://jenkins.qa.ubuntu.com/job/mir-ci/5851/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5267
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/160/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5267
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7786
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/158
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/158/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/17/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26087

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

It seems highly likely we will need this. Even if I don't know the exact change needing it...

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

alright by me

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/110
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/110/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5289
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7802
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/169
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/28
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26145

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^ bug 1524161

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-12-03 06:20:48 +0000
+++ debian/control 2015-12-15 14:07:55 +0000
@@ -332,7 +332,7 @@
332 Contains the shared libraries required for the Mir server to interact with332 Contains the shared libraries required for the Mir server to interact with
333 the hardware platform using the Android drivers.333 the hardware platform using the Android drivers.
334334
335Package: mir-platform-input-evdev4335Package: mir-platform-input-evdev5
336Section: libs336Section: libs
337Architecture: linux-any337Architecture: linux-any
338Multi-Arch: same338Multi-Arch: same
@@ -397,7 +397,7 @@
397 mir-platform-graphics-mesa-kms7,397 mir-platform-graphics-mesa-kms7,
398 mir-platform-graphics-mesa-x7,398 mir-platform-graphics-mesa-x7,
399 mir-client-platform-mesa3,399 mir-client-platform-mesa3,
400 mir-platform-input-evdev4,400 mir-platform-input-evdev5,
401Description: Display server for Ubuntu - desktop driver metapackage401Description: Display server for Ubuntu - desktop driver metapackage
402 Mir is a display server running on linux systems, with a focus on efficiency,402 Mir is a display server running on linux systems, with a focus on efficiency,
403 robust operation and a well-defined driver model.403 robust operation and a well-defined driver model.
@@ -413,7 +413,7 @@
413Depends: ${misc:Depends},413Depends: ${misc:Depends},
414 mir-platform-graphics-android7,414 mir-platform-graphics-android7,
415 mir-client-platform-android3,415 mir-client-platform-android3,
416 mir-platform-input-evdev4,416 mir-platform-input-evdev5,
417Description: Display server for Ubuntu - android driver metapackage417Description: Display server for Ubuntu - android driver metapackage
418 Mir is a display server running on linux systems, with a focus on efficiency,418 Mir is a display server running on linux systems, with a focus on efficiency,
419 robust operation and a well-defined driver model.419 robust operation and a well-defined driver model.
420420
=== renamed file 'debian/mir-platform-input-evdev4.install' => 'debian/mir-platform-input-evdev5.install'
--- debian/mir-platform-input-evdev4.install 2015-11-04 07:43:28 +0000
+++ debian/mir-platform-input-evdev5.install 2015-12-15 14:07:55 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/mir/server-platform/input-evdev.so.41usr/lib/*/mir/server-platform/input-evdev.so.5
22
=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt 2015-11-19 15:02:23 +0000
+++ src/platforms/CMakeLists.txt 2015-12-15 14:07:55 +0000
@@ -3,8 +3,8 @@
3# This ABI is much smaller than the full libmirplatform ABI.3# This ABI is much smaller than the full libmirplatform ABI.
4#4#
5# TODO: Add an extra driver-ABI check target.5# TODO: Add an extra driver-ABI check target.
6set(MIR_SERVER_INPUT_PLATFORM_ABI 4)6set(MIR_SERVER_INPUT_PLATFORM_ABI 5)
7set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.18)7set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.19)
8set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)8set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
9set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")9set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")
10set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)10set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)

Subscribers

People subscribed via source and target branches