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

[Ted Gould]

Add Upstart job

Upstart job

[Sebastien Bacher (seb128)]

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?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:58
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-bluetooth-ci/12/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-bluetooth/upstart-job]

59. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-bluetooth-ci/13/rebuild

review: Approve (continuous-integration)

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

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-09 22:11:59 +0000
+++ data/Makefile.am	2013-08-27 20:15:21 +0000
@@ -3,11 +3,11 @@
 indicatorsdir = $(datadir)/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.bluetooth
 
-# the dbus service file
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-bluetooth.service
+# the upstart job file
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-bluetooth.conf
 
-%.service: %.service.in
+%.conf: %.conf.in
 	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
@@ -19,5 +19,5 @@
   com.canonical.indicator.bluetooth.gschema.xml.in
 
 CLEANFILES = \
-  $(dbus_services_DATA) \
+  $(upstart_jobs_DATA) \
   $(gsettings_SCHEMAS)
 
=== added file 'data/indicator-bluetooth.conf.in'
--- data/indicator-bluetooth.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-bluetooth.conf.in	2013-08-27 20:15:21 +0000
@@ -0,0 +1,8 @@
+description "Indicator Bluetooth Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-bluetooth-service
 
=== removed file 'data/indicator-bluetooth.service.in'
--- data/indicator-bluetooth.service.in	2013-01-31 17:42:17 +0000
+++ data/indicator-bluetooth.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service