Merge lp:~pete-woods/unity-scopes-api/add-system-session-files into lp:unity-scopes-api/devel

[Pete Woods]

Add SystemD session files

Add SystemD session files

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

PASSED: Continuous integration, rev:698
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/70/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1700
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1707
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1482/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1482/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1482/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1482/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1482/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1482
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1482/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[dobey (dobey)]

You don't need the / between $SNAP and before @CMAKE_INSTALL_PREFIX@ here, but shouldn't break things and otherwise looks ok.

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-10-02 09:11:25 +0000
+++ data/CMakeLists.txt	2017-02-22 15:17:42 +0000
@@ -14,6 +14,23 @@
 configure_file(scope-registry.conf.in scope-registry.conf @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/scope-registry.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 
+# systemd config for smart scopes proxy
+configure_file(smart-scopes-proxy.service.in smart-scopes-proxy.service @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smart-scopes-proxy.service DESTINATION lib/systemd/user)
+
+# systemd config for scope registry
+configure_file(scope-registry.service.in scope-registry.service @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/scope-registry.service DESTINATION lib/systemd/user)
+
+# transitional upstart override files to avoid running twice when upstart runs under systemd
+install(
+  FILES
+    smart-scopes-proxy.override
+    scope-registry.override
+  DESTINATION
+    ${CMAKE_INSTALL_DATADIR}/upstart/systemd-session/upstart
+)
+
 # apport package hook
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libunity-scopes.py libunity-scopes${UNITY_SCOPES_SOVERSION}.py COPYONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunity-scopes${UNITY_SCOPES_SOVERSION}.py

=== added file 'data/scope-registry.override'
--- data/scope-registry.override	1970-01-01 00:00:00 +0000
+++ data/scope-registry.override	2017-02-22 15:17:42 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'data/scope-registry.service.in'
--- data/scope-registry.service.in	1970-01-01 00:00:00 +0000
+++ data/scope-registry.service.in	2017-02-22 15:17:42 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Scope registry
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=$SNAP/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@UNITY_SCOPES_LIB@/scoperegistry
+Restart=on-failure

=== added file 'data/smart-scopes-proxy.override'
--- data/smart-scopes-proxy.override	1970-01-01 00:00:00 +0000
+++ data/smart-scopes-proxy.override	2017-02-22 15:17:42 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'data/smart-scopes-proxy.service.in'
--- data/smart-scopes-proxy.service.in	1970-01-01 00:00:00 +0000
+++ data/smart-scopes-proxy.service.in	2017-02-22 15:17:42 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Smart scopes proxy
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=$SNAP/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@UNITY_SCOPES_LIB@/smartscopesproxy upstart
+Restart=on-failure

=== modified file 'debian/libunity-scopes.install.in'
--- debian/libunity-scopes.install.in	2016-02-12 02:24:48 +0000
+++ debian/libunity-scopes.install.in	2017-02-22 15:17:42 +0000
@@ -1,8 +1,6 @@
 var/lib/libunity-scopes/version
 usr/lib/*/libunity-scopes.so.*
 usr/lib/*/unity-scopes
-usr/lib/*/unity-scopes/scoperegistry
-usr/lib/*/unity-scopes/scoperunner
-usr/lib/*/unity-scopes/smartscopesproxy
-usr/share/upstart/sessions/*.conf
-usr/share/apport/package-hooks/*.py
+usr/lib/systemd
+usr/share/upstart
+usr/share/apport