Merge lp:~ted/indicator-bluetooth/upstart-job into lp:indicator-bluetooth/13.10

Proposed by Ted Gould on 2013-08-27
Status: Work in progress
Proposed branch: lp:~ted/indicator-bluetooth/upstart-job
Merge into: lp:indicator-bluetooth/13.10
Diff against target: 47 lines (+13/-8)
3 files modified
data/Makefile.am (+5/-5)
data/indicator-bluetooth.conf.in (+8/-0)
data/indicator-bluetooth.service.in (+0/-3)
To merge this branch: bzr merge lp:~ted/indicator-bluetooth/upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-08-27
Indicator Applet Developers 2013-08-27 Pending
Review via email: mp+182464@code.launchpad.net

Commit message

Add Upstart job

Description of the change

Upstart job

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks for the work, similar to https://code.launchpad.net/~ted/indicator-session/upstart-job/+merge/166373 ... why do we need to export the env and do we need that to land this cycle?

59. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

Unmerged revisions

59. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

58. By Ted Gould on 2013-08-27

Adding an Upstart job

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2013-08-09 22:11:59 +0000
3+++ data/Makefile.am 2013-08-27 20:15:21 +0000
4@@ -3,11 +3,11 @@
5 indicatorsdir = $(datadir)/unity/indicators
6 dist_indicators_DATA = com.canonical.indicator.bluetooth
7
8-# the dbus service file
9-dbus_servicesdir = $(datadir)/dbus-1/services
10-dbus_services_DATA = indicator-bluetooth.service
11+# the upstart job file
12+upstart_jobsdir = $(datadir)/upstart/sessions
13+upstart_jobs_DATA = indicator-bluetooth.conf
14
15-%.service: %.service.in
16+%.conf: %.conf.in
17 sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
18
19 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
20@@ -19,5 +19,5 @@
21 com.canonical.indicator.bluetooth.gschema.xml.in
22
23 CLEANFILES = \
24- $(dbus_services_DATA) \
25+ $(upstart_jobs_DATA) \
26 $(gsettings_SCHEMAS)
27
28=== added file 'data/indicator-bluetooth.conf.in'
29--- data/indicator-bluetooth.conf.in 1970-01-01 00:00:00 +0000
30+++ data/indicator-bluetooth.conf.in 2013-08-27 20:15:21 +0000
31@@ -0,0 +1,8 @@
32+description "Indicator Bluetooth Backend"
33+
34+start on indicators-loaded or indicator-services-start
35+stop on desktop-end or indicator-services-end
36+
37+respawn
38+
39+exec @pkglibexecdir@/indicator-bluetooth-service
40
41=== removed file 'data/indicator-bluetooth.service.in'
42--- data/indicator-bluetooth.service.in 2013-01-31 17:42:17 +0000
43+++ data/indicator-bluetooth.service.in 1970-01-01 00:00:00 +0000
44@@ -1,3 +0,0 @@
45-[D-BUS Service]
46-Name=com.canonical.indicator.bluetooth
47-Exec=@pkglibexecdir@/indicator-bluetooth-service

Subscribers

People subscribed via source and target branches