Merge lp:~seb128/hud/systemd into lp:hud

[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

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

[Martin Pitt (pitti)]

Previously reviewed/approved: https://code.launchpad.net/~seb128/hud/systemd-for-session/+merge/300430

This just drops the changelog. LGTM, thanks!

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-11-08 09:03:30 +0000
+++ data/CMakeLists.txt	2016-10-26 09:59:14 +0000
@@ -31,36 +31,22 @@
 )
 
 ###########################
-# Upstart Job
+# Systemd Unit
 ###########################
 
-set(HUD_UPSTART
-"${CMAKE_CURRENT_BINARY_DIR}/hud.conf"
-)
-
-set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud")
-configure_file("hud.conf.in"
-  "${HUD_UPSTART}"
-  @ONLY
-)
-
-install(
-FILES
-"${HUD_UPSTART}"
-DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions"
-)
-
-set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud")
-configure_file("dbus-activation-hack.sh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/dbus-activation-hack.sh"
-  @ONLY
-)
-
-install(
-PROGRAMS
-"${CMAKE_CURRENT_BINARY_DIR}/dbus-activation-hack.sh"
-DESTINATION
-"${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud"
+# where to install
+pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
+message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
+
+set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud")
+configure_file("hud.service.in"
+  "hud.service"
+  @ONLY
+)
+
+install(
+FILES "${CMAKE_CURRENT_BINARY_DIR}/hud.service"
+DESTINATION "${SYSTEMD_USER_DIR}"
 )
 
 ###########################
@@ -68,14 +54,14 @@
 ###########################
 
 configure_file(
-  "window-stack-bridge.conf.in"
-  "window-stack-bridge.conf"
+  "window-stack-bridge.service.in"
+  "window-stack-bridge.service"
   @ONLY
 )
 
 install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/window-stack-bridge.conf"
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions"
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/window-stack-bridge.service"
+  DESTINATION "${SYSTEMD_USER_DIR}"
 )
 
 ###########################

=== modified file 'data/com.canonical.hud.service.in'
--- data/com.canonical.hud.service.in	2013-06-10 17:33:58 +0000
+++ data/com.canonical.hud.service.in	2016-10-26 09:59:14 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=com.canonical.hud
-Exec=@pkglibexecdir@/dbus-activation-hack.sh
+Exec=@pkglibexecdir@/hud-service
+SystemdService=hud.service

=== removed file 'data/dbus-activation-hack.sh.in'
--- data/dbus-activation-hack.sh.in	2013-10-08 20:19:53 +0000
+++ data/dbus-activation-hack.sh.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# This is a quick hack to make it so that DBus activation works as the
-# DBus daemon holds onto the PID until the name gets registered.  So we
-# need the PID to exist until then.  10 seconds should be more that enough
-# time for the service to register the name.
-#
-# This can go away if we get DBus Activation for Upstart
-
-if [ "x$UPSTART_SESSION" != "x" ]; then
-	start hud
-	sleep 10
-else
-	@pkglibexecdir@/hud-service
-fi

=== removed file 'data/hud.conf.in'
--- data/hud.conf.in	2014-09-15 15:49:21 +0000
+++ data/hud.conf.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-description "Unity HUD"
-
-# Currently started by the dbus service file
-# start on dbus-activation com.canonical.hud
-stop on desktop-end
-start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))
-
-exec @pkglibexecdir@/hud-service

=== added file 'data/hud.service.in'
--- data/hud.service.in	1970-01-01 00:00:00 +0000
+++ data/hud.service.in	2016-10-26 09:59:14 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Unity HUD
+PartOf=graphical-session.target
+
+[Service]
+Type=dbus
+BusName=com.canonical.hud
+ExecStart=@pkglibexecdir@/hud-service

=== removed file 'data/window-stack-bridge.conf.in'
--- data/window-stack-bridge.conf.in	2014-09-15 15:53:16 +0000
+++ data/window-stack-bridge.conf.in	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-description "Window Stack Bridge"
-
-start on started dbus
-stop on desktop-end
-
-exec @pkglibexecdir@/window-stack-bridge

=== added file 'data/window-stack-bridge.service.in'
--- data/window-stack-bridge.service.in	1970-01-01 00:00:00 +0000
+++ data/window-stack-bridge.service.in	2016-10-26 09:59:14 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Window Stack Bridge
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=@pkglibexecdir@/window-stack-bridge
+Restart=on-failure

=== modified file 'debian/control'
--- debian/control	2015-08-20 13:44:43 +0000
+++ debian/control	2016-10-26 09:59:14 +0000
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 3.4),
                debhelper (>= 9),
                gnome-common,
                gobject-introspection,
@@ -27,6 +27,7 @@
                python-setuptools,
                qtbase5-dev,
                qtdbustest-runner,
+               systemd,
                valac,
                xvfb,
 Standards-Version: 3.9.4

=== modified file 'debian/hud.install'
--- debian/hud.install	2013-06-10 17:36:43 +0000
+++ debian/hud.install	2016-10-26 09:59:14 +0000
@@ -3,4 +3,4 @@
 usr/lib/*/hud
 usr/share/dbus-1
 usr/share/glib-2.0
-usr/share/upstart/sessions
+usr/lib/systemd

=== added file 'debian/hud.links'
--- debian/hud.links	1970-01-01 00:00:00 +0000
+++ debian/hud.links	2016-10-26 09:59:14 +0000
@@ -0,0 +1,1 @@
+usr/lib/systemd/user/window-stack-bridge.service usr/lib/systemd/user/ubuntu-session.target.wants/window-stack-bridge.service