diff options
| author | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-03-20 16:57:52 +0900 |
|---|---|---|
| committer | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-03-20 16:57:52 +0900 |
| commit | ec5a330539509ee5360809699e0e758046f8d55f (patch) | |
| tree | e7cb45fe1ed9a56f51fb8c8a9f7987dc85977a42 | |
| parent | 58ab92967fb7d55e23e6df229475f536c097b008 (diff) | |
| parent | 6113f1956bfd1fcbf5af54a7fec5928f4a1be35b (diff) | |
| download | alarm-manager-ec5a330539509ee5360809699e0e758046f8d55f.tar.gz alarm-manager-ec5a330539509ee5360809699e0e758046f8d55f.tar.bz2 alarm-manager-ec5a330539509ee5360809699e0e758046f8d55f.zip | |
Merge branch 'master' into tizen_2.1
added a type
Conflicts:
alarm-server.manifest
packaging/alarm-manager.spec
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
| -rw-r--r-- | alarm-server.manifest | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/alarm-server.manifest b/alarm-server.manifest index ca41fe7..2468250 100644 --- a/alarm-server.manifest +++ b/alarm-server.manifest @@ -12,5 +12,7 @@ <filesystem path="/etc/init.d/alarm-server_run" label="_" exec_label="none" /> <filesystem path="/etc/rc.d/rc3.d/S80alarm-server" label="_" exec_label="none" /> <filesystem path="/etc/rc.d/rc5.d/S80alarm-server" label="_" exec_label="none" /> + <filesystem path="/usr/lib/systemd/system/alarm-server.service" label="_" exec_label="none" /> + <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/alarm-server.service" label="_" exec_label="none" /> </assign> </manifest> |