Unity HUD

Merge lp:~ted/hud/older-cmake into lp:hud

  1. older-cmake
  2. Merge into trunk.15.10
Proposed by Ted Gould
Status: Approved
Approved by: Marco Trevisan (Treviño)
Approved revision: 408
Proposed branch: lp:~ted/hud/older-cmake
Merge into: lp:hud
Prerequisite: lp:~seb128/hud/systemd-for-session
Diff against target: 27 lines (+4/-2)
2 files modified
data/CMakeLists.txt (+3/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~ted/hud/older-cmake
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+301296@code.launchpad.net

Commit message

Support older CMake versions for vivid landing

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:408
https://jenkins.canonical.com/unity-api-1/job/lp-hud-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/257/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/265
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/200
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/200
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/200
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/129/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/129/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/129/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-hud-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Better not to bee too much in the bleeding edge, thanks.

review: Approve
Reply

Unmerged revisions

408. By Ted Gould

Support older versions of CMake

407. By Sebastien Bacher

Switch the user session to systemd. Remove the dbus activation hacks and
the upstart jobs since the only session using those the hud is unity
which is the one migrating to systemd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-07-27 15:32:58 +0000
3+++ data/CMakeLists.txt 2016-07-27 15:32:58 +0000
4@@ -35,7 +35,9 @@
5 ###########################
6
7 # where to install
8-pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
9+# Uncomment when we drop Vivid
10+# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
11+set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
12 message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
13
14 set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud")
15
16=== modified file 'debian/control'
17--- debian/control 2016-07-27 15:32:58 +0000
18+++ debian/control 2015-08-20 13:44:43 +0000
19@@ -2,7 +2,7 @@
20 Section: gnome
21 Priority: optional
22 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
23-Build-Depends: cmake (>= 3.4),
24+Build-Depends: cmake,
25 debhelper (>= 9),
26 gnome-common,
27 gobject-introspection,

Subscribers

People subscribed via source and target branches