Mir

Merge lp:~alan-griffiths/mir/fix-1662942 into lp:mir

  1. fix-1662942
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Merged at revision: 4019
Proposed branch: lp:~alan-griffiths/mir/fix-1662942
Merge into: lp:mir
Diff against target: 41 lines (+5/-5)
1 file modified
debian/control (+5/-5)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1662942
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Daniel van Vugt Approve
Review via email: mp+316743@code.launchpad.net

Commit message

Version the -dev package dependencies. (LP: #1662942)

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4018
https://mir-jenkins.ubuntu.com/job/mir-ci/2956/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3917/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4003
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3993
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3993
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3993
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3944/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3944
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3944/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3944
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3944/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3944
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3944/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/3944
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3944/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/3944
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3944/artifact/output/*zip*/output.zip

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

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

^^^
Bug 1663122

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Sounds right.

I'm curious how anyone got into that situation though (partial upgrade of Mir packages).

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1081/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3925
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1141/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1142/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4011
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4001
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4001
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4001
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3952/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/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3952/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3952/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3952/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/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3952/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/3952
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3952/artifact/output/*zip*/output.zip

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

Can't merge because it already merged :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-02-07 08:56:42 +0000
+++ debian/control 2017-02-08 18:10:51 +0000
@@ -115,7 +115,7 @@
115Multi-Arch: same115Multi-Arch: same
116Pre-Depends: ${misc:Pre-Depends}116Pre-Depends: ${misc:Pre-Depends}
117Depends: libmircommon7 (= ${binary:Version}),117Depends: libmircommon7 (= ${binary:Version}),
118 libmircore-dev,118 libmircore-dev (= ${binary:Version}),
119 libprotobuf-dev (>= 2.4.1),119 libprotobuf-dev (>= 2.4.1),
120 libxkbcommon-dev,120 libxkbcommon-dev,
121 ${misc:Depends},121 ${misc:Depends},
@@ -133,7 +133,7 @@
133Multi-Arch: same133Multi-Arch: same
134Pre-Depends: ${misc:Pre-Depends}134Pre-Depends: ${misc:Pre-Depends}
135Depends: libmirplatform15 (= ${binary:Version}),135Depends: libmirplatform15 (= ${binary:Version}),
136 libmircommon-dev,136 libmircommon-dev (= ${binary:Version}),
137 libboost-program-options-dev,137 libboost-program-options-dev,
138 ${misc:Depends},138 ${misc:Depends},
139Breaks: libmirplatform (<< 0.6)139Breaks: libmirplatform (<< 0.6)
@@ -411,7 +411,7 @@
411Architecture: linux-any411Architecture: linux-any
412Multi-Arch: same412Multi-Arch: same
413Pre-Depends: ${misc:Pre-Depends}413Pre-Depends: ${misc:Pre-Depends}
414Depends: libmirclient-dev,414Depends: libmirclient-dev (= ${binary:Version}),
415 ${misc:Depends},415 ${misc:Depends},
416Description: Display server for Ubuntu - client platform library for Mesa development files416Description: Display server for Ubuntu - client platform library for Mesa development files
417 Mir is a display server running on linux systems, with a focus on efficiency,417 Mir is a display server running on linux systems, with a focus on efficiency,
@@ -518,8 +518,8 @@
518Multi-Arch: same518Multi-Arch: same
519Pre-Depends: ${misc:Pre-Depends}519Pre-Depends: ${misc:Pre-Depends}
520Depends: ${misc:Depends},520Depends: ${misc:Depends},
521 libmircommon-dev,521 libmircommon-dev (= ${binary:Version}),
522 libmirplatform-dev522 libmirplatform-dev (= ${binary:Version})
523Description: Display server for Ubuntu - Renderer development files523Description: Display server for Ubuntu - Renderer development files
524 Mir is a display server running on linux systems, with a focus on efficiency,524 Mir is a display server running on linux systems, with a focus on efficiency,
525 robust operation and a well-defined driver model.525 robust operation and a well-defined driver model.

Subscribers

People subscribed via source and target branches