Mir

Merge lp://qastaging/~raof/mir/plugin-probe-packaging into lp://qastaging/mir

  1. plugin-probe-packaging
  2. Merge into development-branch
Proposed by Chris Halse Rogers
Status: Work in progress
Proposed branch: lp://qastaging/~raof/mir/plugin-probe-packaging
Merge into: lp://qastaging/mir
Prerequisite: lp://qastaging/~raof/mir/server-side-platform-probing
Diff against target: 204 lines (+59/-38) (has conflicts)
7 files modified
debian/control (+48/-30)
debian/mir-client-platform-android.install (+1/-1)
debian/mir-client-platform-mesa.install (+1/-1)
debian/mir-platform-graphics-android.install (+1/-1)
debian/mir-platform-graphics-mesa.install (+1/-1)
debian/mir-test-tools.install (+2/-1)
debian/rules (+5/-3)
Text conflict in debian/control
Text conflict in debian/rules
Text conflict in platform-ABI-sha1sums
Text conflict in server-ABI-sha1sums
Text conflict in tests/mir_test_framework/headless_test.cpp
Text conflict in tests/mir_test_framework/stubbed_graphics_platform.cpp
Text conflict in tests/mir_test_framework/testing_client_options.cpp
To merge this branch: bzr merge lp://qastaging/~raof/mir/plugin-probe-packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+243006@code.qastaging.launchpad.net

Commit message

Move the platform plugins into a private directory, versioned with the relevant ABI.

Description of the change

Add the Debian packaging for privatise-all-the-things.

This is the final branch of the series, and is the only one that should land.

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

FAILED: Continuous integration, rev:2104
http://jenkins.qa.ubuntu.com/job/mir-ci/2279/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/348/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/348/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Chris Halse Rogers (raof) wrote :

Bah.

I don't know why Launchpad is failing at this. These branches *should* be stacked one on top of the other, but LP is confused.

Reply

Unmerged revisions

2104. By Chris Halse Rogers

Packaging for probable client/server platform plugins

2103. By Chris Halse Rogers

Oops. Add a whole bunch of accidentally missing files

2102. By Chris Halse Rogers

Move dummy modules alongside their regular counterparts

2101. By Chris Halse Rogers

Implement server-side graphics platform probe

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches