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

Proposed by Dimitri John Ledkov on 2016-12-21
Status: Merged
Approved by: Łukasz Zemczak on 2017-01-04
Approved revision: 509
Merged at revision: 507
Proposed branch: lp:~xnox/unity-scope-click/systemd
Merge into: lp:unity-scope-click
Diff against target: 49 lines (+14/-1)
4 files modified
data/CMakeLists.txt (+5/-0)
data/click-scope-departments-db.service.in (+8/-0)
debian/control (+0/-1)
debian/unity-scope-click-departmentsdb.install (+1/-0)
To merge this branch: bzr merge lp:~xnox/unity-scope-click/systemd
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2016-12-21 Approve on 2017-01-04
Dimitri John Ledkov (community) Approve on 2016-12-21
Review via email: mp+313713@code.launchpad.net

Commit message

Add systemd unit for departments db.
Drop upstart dependency.

Description of the change

Add systemd unit for departments db.
Drop upstart dependency.

To post a comment you must log in.
Dimitri John Ledkov (xnox) :
review: Approve
lp:~xnox/unity-scope-click/systemd updated on 2016-12-22
509. By Dimitri John Ledkov on 2016-12-22

systemd doesn't substitude $HOME

Dimitri John Ledkov (xnox) wrote :

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

Łukasz Zemczak (sil2100) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-11-03 20:21:42 +0000
3+++ data/CMakeLists.txt 2016-12-22 13:19:32 +0000
4@@ -5,6 +5,11 @@
5 configure_file(${DEPARTMENTS_UPSTART_JOB}.in ${DEPARTMENTS_UPSTART_JOB} @ONLY)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_UPSTART_JOB} DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
7
8+# systemd unit for default departments db
9+set(DEPARTMENTS_SYSTEMD_UNIT click-scope-departments-db.service)
10+configure_file(${DEPARTMENTS_SYSTEMD_UNIT}.in ${DEPARTMENTS_SYSTEMD_UNIT} @ONLY)
11+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEPARTMENTS_SYSTEMD_UNIT} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/user)
12+
13 install(
14 FILES clickscope-screenshot.jpg apps-scope.png ubuntu-logo.png ubuntu-store-scope.png store-scope-icon.svg
15 DESTINATION "${APPS_DATA_DIR}"
16
17=== added file 'data/click-scope-departments-db.service.in'
18--- data/click-scope-departments-db.service.in 1970-01-01 00:00:00 +0000
19+++ data/click-scope-departments-db.service.in 2016-12-22 13:19:32 +0000
20@@ -0,0 +1,8 @@
21+[Unit]
22+Description=Default Click Departments Database
23+PartOf=graphical-session.target
24+
25+[Service]
26+Type=oneshot
27+ExecStart=/bin/cp -n @APPS_DATA_DIR@departments.db .cache/click-departments.db
28+ExecStart=@APPS_DATA_DIR@update_schema.sh .cache/click-departments.db
29
30=== modified file 'debian/control'
31--- debian/control 2016-10-24 21:28:14 +0000
32+++ debian/control 2016-12-22 13:19:32 +0000
33@@ -46,7 +46,6 @@
34 packagekit-tools,
35 ubuntu-app-launch-tools,
36 ubuntu-download-manager,
37- upstart,
38 ${misc:Depends},
39 ${shlibs:Depends},
40 Breaks: unity (<< 7.0),
41
42=== modified file 'debian/unity-scope-click-departmentsdb.install'
43--- debian/unity-scope-click-departmentsdb.install 2014-08-05 09:11:12 +0000
44+++ debian/unity-scope-click-departmentsdb.install 2016-12-22 13:19:32 +0000
45@@ -1,3 +1,4 @@
46 usr/share/unity/scopes/clickapps/departments.db
47 usr/share/unity/scopes/clickapps/update_schema.sh
48 usr/share/upstart/sessions/*.conf
49+usr/lib/systemd/user/*.service

Subscribers

People subscribed via source and target branches