Merge lp:~pitti/indicator-network/systemd-unit into lp:indicator-network

[Martin Pitt]

Add systemd user unit

Add systemd unit. This replaces https://code.launchpad.net/~ted/indicator-network/systemd-unit/+merge/300443 as the latter got stale (needed trunk merge).

[Martin Pitt (pitti)]

LGTM, thanks!

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-11-20 13:14:50 +0000
+++ data/CMakeLists.txt	2016-10-19 10:37:13 +0000
@@ -55,6 +55,47 @@
 )
 
 ###########################
+# Indicator-network systemd jobs
+###########################
+
+# Uncomment when we drop Vivid
+# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
+set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
+message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
+
+configure_file (
+  indicator-network-secret-agent.service.in
+  indicator-network-secret-agent.service
+  @ONLY
+)
+
+configure_file (
+  indicator-network.service.in
+  indicator-network.service
+  @ONLY
+)
+
+install (
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/indicator-network-secret-agent.service"
+  DESTINATION ${SYSTEMD_USER_DIR}
+)
+
+install (
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/indicator-network.service"
+  DESTINATION ${SYSTEMD_USER_DIR}
+)
+
+###########################
+# Indicator-network systemd Upstart overrides
+###########################
+
+set (SYSTEMD_UPSTART_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
+install (
+  FILES indicator-network.override indicator-network-secret-agent.override
+  DESTINATION ${SYSTEMD_UPSTART_DIR}
+)
+
+###########################
 # GSettings
 ###########################
 
 
=== added file 'data/indicator-network-secret-agent.override'
--- data/indicator-network-secret-agent.override	1970-01-01 00:00:00 +0000
+++ data/indicator-network-secret-agent.override	2016-10-19 10:37:13 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'data/indicator-network-secret-agent.service.in'
--- data/indicator-network-secret-agent.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-network-secret-agent.service.in	2016-10-19 10:37:13 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Indicator Network Secret Agent
+PartOf=indicator-network.service
+
+[Service]
+ExecStart=@AGENT_SERVICE@
+Restart=on-failure
 
=== added file 'data/indicator-network.override'
--- data/indicator-network.override	1970-01-01 00:00:00 +0000
+++ data/indicator-network.override	2016-10-19 10:37:13 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'data/indicator-network.service.in'
--- data/indicator-network.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-network.service.in	2016-10-19 10:37:13 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=Indicator Network Backend
+PartOf=graphical-session.target
+After=indicators-pre.target
+Wants=indicator-network-secret-agent.service
+
+[Service]
+ExecStart=@NETWORK_SERVICE@
+Restart=on-failure
 
=== modified file 'debian/control'
--- debian/control	2016-09-20 14:53:16 +0000
+++ debian/control	2016-10-19 10:37:13 +0000
@@ -30,7 +30,9 @@
                qtbase5-dev-tools,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
-               qttools5-dev-tools
+               qttools5-dev-tools,
+               valgrind [amd64 armhf i386 powerpc],
+               systemd,
 Standards-Version: 3.9.5
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead. ~indicator-applet-developers will notice
@@ -45,6 +47,7 @@
 Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         indicator-common,
          network-manager,
          network-manager-openvpn,
          network-manager-pptp,
 
=== modified file 'debian/indicator-network.install'
--- debian/indicator-network.install	2015-12-04 13:18:04 +0000
+++ debian/indicator-network.install	2016-10-19 10:37:13 +0000
@@ -1,7 +1,9 @@
 usr/share/upstart/xdg/autostart/indicator-network.desktop
 usr/share/upstart/sessions/*
+usr/share/upstart/systemd-session
 usr/share/glib-2.0/schemas/com.canonical.indicator.network.gschema.xml
 usr/share/unity/indicators/com.canonical.indicator.network
 usr/lib/*/indicator-network/*
+usr/lib/systemd
 etc/xdg/autostart/indicator-network.desktop
 usr/share/locale