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
1=== modified file 'debian/control'
2--- debian/control 2015-12-03 06:20:48 +0000
3+++ debian/control 2015-12-15 14:07:55 +0000
4@@ -332,7 +332,7 @@
5 Contains the shared libraries required for the Mir server to interact with
6 the hardware platform using the Android drivers.
7
8-Package: mir-platform-input-evdev4
9+Package: mir-platform-input-evdev5
10 Section: libs
11 Architecture: linux-any
12 Multi-Arch: same
13@@ -397,7 +397,7 @@
14 mir-platform-graphics-mesa-kms7,
15 mir-platform-graphics-mesa-x7,
16 mir-client-platform-mesa3,
17- mir-platform-input-evdev4,
18+ mir-platform-input-evdev5,
19 Description: Display server for Ubuntu - desktop driver metapackage
20 Mir is a display server running on linux systems, with a focus on efficiency,
21 robust operation and a well-defined driver model.
22@@ -413,7 +413,7 @@
23 Depends: ${misc:Depends},
24 mir-platform-graphics-android7,
25 mir-client-platform-android3,
26- mir-platform-input-evdev4,
27+ mir-platform-input-evdev5,
28 Description: Display server for Ubuntu - android driver metapackage
29 Mir is a display server running on linux systems, with a focus on efficiency,
30 robust operation and a well-defined driver model.
31
32=== renamed file 'debian/mir-platform-input-evdev4.install' => 'debian/mir-platform-input-evdev5.install'
33--- debian/mir-platform-input-evdev4.install 2015-11-04 07:43:28 +0000
34+++ debian/mir-platform-input-evdev5.install 2015-12-15 14:07:55 +0000
35@@ -1,1 +1,1 @@
36-usr/lib/*/mir/server-platform/input-evdev.so.4
37+usr/lib/*/mir/server-platform/input-evdev.so.5
38
39=== modified file 'src/platforms/CMakeLists.txt'
40--- src/platforms/CMakeLists.txt 2015-11-19 15:02:23 +0000
41+++ src/platforms/CMakeLists.txt 2015-12-15 14:07:55 +0000
42@@ -3,8 +3,8 @@
43 # This ABI is much smaller than the full libmirplatform ABI.
44 #
45 # TODO: Add an extra driver-ABI check target.
46-set(MIR_SERVER_INPUT_PLATFORM_ABI 4)
47-set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.18)
48+set(MIR_SERVER_INPUT_PLATFORM_ABI 5)
49+set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.19)
50 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
51 set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")
52 set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)

Subscribers

People subscribed via source and target branches