1
=== modified file 'data/CMakeLists.txt'
2
--- data/CMakeLists.txt	2016-05-14 02:07:10 +0000
3
+++ data/CMakeLists.txt	2016-07-22 19:03:43 +0000
4
@@ -17,6 +17,38 @@
5
17
add_schema (${SCHEMA_FILE})
17
add_schema (${SCHEMA_FILE})
6
18
18
7
19
##
19
##
8
20
##  Systemd Unit File
9
21
##
10
22
11
23
# where to install
12
24
# Uncomment when we drop Vivid
13
25
# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
14
26
set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
15
27
message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
16
28
17
29
set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
18
30
set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}")
19
31
set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
20
32
21
33
# build it
22
34
set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
23
35
configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
24
36
25
37
# install it
26
38
install (FILES "${SYSTEMD_USER_FILE}"
27
39
         DESTINATION "${SYSTEMD_USER_DIR}")
28
40
29
41
##
30
42
##  Upstart systemd override Job File
31
43
##
32
44
33
45
set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
34
46
message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir")
35
47
36
48
install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
37
49
         DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
38
50
39
51
##
40
20
##  Upstart Job File
52
##  Upstart Job File
41
21
##
53
##
42
22
54
43
23
55
44
=== added file 'data/indicator-datetime.override'
45
--- data/indicator-datetime.override	1970-01-01 00:00:00 +0000
46
+++ data/indicator-datetime.override	2016-07-22 19:03:43 +0000
47
@@ -0,0 +1,1 @@
48
1
manual
49
0
2
50
=== added file 'data/indicator-datetime.service.in'
51
--- data/indicator-datetime.service.in	1970-01-01 00:00:00 +0000
52
+++ data/indicator-datetime.service.in	2016-07-22 19:03:43 +0000
53
@@ -0,0 +1,8 @@
54
1
[Unit]
55
2
Description=Indicator Date & Time Backend
56
3
PartOf=graphical-session.target
57
4
After=indicators-pre.target
58
5
59
6
[Service]
60
7
ExecStart=@pkglibexec@/indicator-datetime-service
61
8
Restart=on-failure
62
0
9
63
=== modified file 'debian/control'
64
--- debian/control	2016-07-01 19:46:40 +0000
65
+++ debian/control	2016-07-22 19:03:43 +0000
66
@@ -35,6 +35,8 @@
67
35
               libmessaging-menu-dev,
35
               libmessaging-menu-dev,
68
36
               uuid-dev,
36
               uuid-dev,
69
37
               libubuntu-app-launch2-dev (>= 0.9),
37
               libubuntu-app-launch2-dev (>= 0.9),
70
38
# to locate the place to put systemd files
71
39
               systemd,
72
38
Standards-Version: 3.9.3
40
Standards-Version: 3.9.3
73
39
Homepage: https://launchpad.net/indicator-datetime
41
Homepage: https://launchpad.net/indicator-datetime
74
40
# If you aren't a member of ~indicator-applet-developers but need to upload
42
# If you aren't a member of ~indicator-applet-developers but need to upload
75
@@ -48,6 +50,7 @@
76
48
Depends: ${shlibs:Depends}, 
50
Depends: ${shlibs:Depends}, 
77
49
         ${misc:Depends},
51
         ${misc:Depends},
78
50
         gsettings-ubuntu-schemas (>= 0.0.7),
52
         gsettings-ubuntu-schemas (>= 0.0.7),
79
53
         indicator-common,
80
51
         systemd | systemd-shim,
54
         systemd | systemd-shim,
81
52
Recommends: indicator-applet | indicator-renderer,
55
Recommends: indicator-applet | indicator-renderer,
82
53
            evolution-data-server,
56
            evolution-data-server,
Status:	Merged
Approved by:	Martin Pitt on 2016-10-21
Approved revision:	460
Merged at revision:	463
Proposed branch:	lp:~ted/indicator-datetime/systemd-unit
Merge into:	lp:indicator-datetime
Diff against target:	82 lines (+44/-0) 4 files modified data/CMakeLists.txt (+32/-0) data/indicator-datetime.override (+1/-0) data/indicator-datetime.service.in (+8/-0) debian/control (+3/-0)
To merge this branch:	bzr merge lp:~ted/indicator-datetime/systemd-unit
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Martin Pitt			Approve on 2016-10-19
unity-api-1-bot	continuous-integration		Approve on 2016-09-12
PS Jenkins bot	continuous-integration		Pending
Indicator Applet Developers		2016-07-19	Pending
Review via email: mp+300420@code.launchpad.net