Merge lp:~xnox/unity-scope-click/systemd into lp:unity-scope-click

[Dimitri John Ledkov]

Add systemd unit for departments db.
Drop upstart dependency.

Add systemd unit for departments db.
Drop upstart dependency.

[Dimitri John Ledkov (xnox)]

review: Approve

[lp:~xnox/unity-scope-click/systemd]

509. By Dimitri John Ledkov on 2016-12-22

systemd doesn't substitude $HOME

[Dimitri John Ledkov (xnox)]

verified that this works correctly from the bileto ppa, please approve.

[Łukasz Zemczak (sil2100)]

Looks good. Was just wondering if removal of the upstart dependency shouldn't be changed to a dependency of systemd | upstart instead (for formality)? As we basically ship both upstart and systemd files right now. Just a thought.

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-11-03 20:21:42 +0000
+++ data/CMakeLists.txt	2016-12-22 13:19:32 +0000
@@ -5,6 +5,11 @@
 configure_file(${DEPARTMENTS_UPSTART_JOB}.in ${DEPARTMENTS_UPSTART_JOB} @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 
+# systemd unit for default departments db
+set(DEPARTMENTS_SYSTEMD_UNIT click-scope-departments-db.service)
+configure_file(${DEPARTMENTS_SYSTEMD_UNIT}.in ${DEPARTMENTS_SYSTEMD_UNIT} @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_SYSTEMD_UNIT} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/user)
+
 install(
   FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png ubuntu-store-scope.png store-scope-icon.svg
   DESTINATION "${APPS_DATA_DIR}"
 
=== added file 'data/click-scope-departments-db.service.in'
--- data/click-scope-departments-db.service.in	1970-01-01 00:00:00 +0000
+++ data/click-scope-departments-db.service.in	2016-12-22 13:19:32 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Default Click Departments Database
+PartOf=graphical-session.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/cp -n @[e-mail] .cache/click-departments.db
+ExecStart=@APPS_DATA_DIR@update_schema.sh .cache/click-departments.db
 
=== modified file 'debian/control'
--- debian/control	2016-10-24 21:28:14 +0000
+++ debian/control	2016-12-22 13:19:32 +0000
@@ -46,7 +46,6 @@
          packagekit-tools,
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
-         upstart,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),
 
=== modified file 'debian/unity-scope-click-departmentsdb.install'
--- debian/unity-scope-click-departmentsdb.install	2014-08-05 09:11:12 +0000
+++ debian/unity-scope-click-departmentsdb.install	2016-12-22 13:19:32 +0000
@@ -1,3 +1,4 @@
 usr/share/unity/scopes/clickapps/departments.db
 usr/share/unity/scopes/clickapps/update_schema.sh
 usr/share/upstart/sessions/*.conf
+usr/lib/systemd/user/*.service