Mir

Merge lp:~afrantzis/mir/remove-cmake-data-build-dep into lp:mir

  1. remove-cmake-data-build-dep
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 3726
Proposed branch: lp:~afrantzis/mir/remove-cmake-data-build-dep
Merge into: lp:mir
Diff against target: 11 lines (+0/-1)
1 file modified
debian/control (+0/-1)
To merge this branch: bzr merge lp:~afrantzis/mir/remove-cmake-data-build-dep
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alexandros Frantzis (community) Abstain
Cemil Azizoglu (community) Approve
Review via email: mp+307025@code.launchpad.net

Commit message

debian: Remove unnecessary cmake-data build-dep

cmake depends on cmake-data anyway, and removing the build-dep helps resolve cross-building issues with recent sbuild versions.

Description of the change

debian: Remove unnecessary cmake-data build-dep

cmake depends on cmake-data anyway, and removing the build-dep helps resolve cross-building issues with recent sbuild versions.

See https://bugs.launchpad.net/mir/+bug/1628507 for much more info on the cross-building issue.

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Don't top approve until I run a custom CI job containing the CI part of this fix.

review: Needs Information
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3726
https://mir-jenkins.ubuntu.com/job/mir-ci/1841/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2322
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2385
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2376
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2376
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2376
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2350
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2350/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/2350
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2350/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2350
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2350/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/2350
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2350/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/2350
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2350/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Cross-build succeeded:

https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir-cross/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3/console

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

FAILED: Continuous integration, rev:3726
https://mir-jenkins.ubuntu.com/job/mir-ci/1843/
Executed test runs:
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-mir/2324/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2387
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2379
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2379/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2379

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Ignore last CI result, I started CI again by mistake and aborted it.

Revision history for this message
Mir CI Bot (mir-ci-bot) :
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 2016-09-12 11:49:12 +0000
3+++ debian/control 2016-09-28 13:16:30 +0000
4@@ -4,7 +4,6 @@
5 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6 XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
7 Build-Depends: cmake,
8- cmake-data,
9 pkg-config,
10 debhelper (>= 9),
11 doxygen,

Subscribers

People subscribed via source and target branches