Merge lp:~ted/indicator-datetime/systemd-unit into lp:indicator-datetime

[Ted Gould]

Adding a systemd user unit

New fun snappy stuff

[lp:~ted/indicator-datetime/systemd-unit]

458. By Ted Gould on 2016-07-19

Vivid is amazing

459. By Ted Gould on 2016-07-20

Adding a restart rule

460. By Ted Gould on 2016-07-22

Merging trunk and resolving conflicts

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:460
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/605
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/611
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/434/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/434
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/434/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

This ends up as ExecStart=/indicator-datetime-service, so the unit fails to start.

review: Needs Fixing

[Martin Pitt (pitti)]

Followup MP in https://code.launchpad.net/~pitti/indicator-datetime/fix-systemd-unit/+merge/308786, I added that to the ticket.

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-14 02:07:10 +0000
+++ data/CMakeLists.txt	2016-07-22 19:03:43 +0000
@@ -17,6 +17,38 @@
 add_schema (${SCHEMA_FILE})
 
 ##
+##  Systemd Unit File
+##
+
+# where to install
+# 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")
+
+set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
+set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}")
+set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
+
+# install it
+install (FILES "${SYSTEMD_USER_FILE}"
+         DESTINATION "${SYSTEMD_USER_DIR}")
+
+##
+##  Upstart systemd override Job File
+##
+
+set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
+message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir")
+
+install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
+         DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
+
+##
 ##  Upstart Job File
 ##
 

=== added file 'data/indicator-datetime.override'
--- data/indicator-datetime.override	1970-01-01 00:00:00 +0000
+++ data/indicator-datetime.override	2016-07-22 19:03:43 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'data/indicator-datetime.service.in'
--- data/indicator-datetime.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-datetime.service.in	2016-07-22 19:03:43 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Indicator Date & Time Backend
+PartOf=graphical-session.target
+After=indicators-pre.target
+
+[Service]
+ExecStart=@pkglibexec@/indicator-datetime-service
+Restart=on-failure

=== modified file 'debian/control'
--- debian/control	2016-07-01 19:46:40 +0000
+++ debian/control	2016-07-22 19:03:43 +0000
@@ -35,6 +35,8 @@
                libmessaging-menu-dev,
                uuid-dev,
                libubuntu-app-launch2-dev (>= 0.9),
+# to locate the place to put systemd files
+               systemd,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-datetime
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -48,6 +50,7 @@
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
          gsettings-ubuntu-schemas (>= 0.0.7),
+         indicator-common,
          systemd | systemd-shim,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,