Merge lp:~charlesk/indicator-bluetooth/upstart-job into lp:indicator-bluetooth/14.04

[Charles Kerr]

Switching DBus service to an Upstart Job.

Looks like this indicator was overlooked back when all the others got switched over to upstart.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

Instead of NotShowIn, you should ship a desktop file with Hidden=true in /usr/share/upstart/xdg/autostart/ (this directory is prepended to XDG_CONFIG_DIRS under upstart user sessions). This will cause it to not start via XDG autostart exactly when user sessions are in use, which is probably what you really want. Having Unity in there smells a bit.

review: Needs Fixing

[Ted Gould (ted)]

On Fri, 2013-12-06 at 17:44 +0000, Iain Lane wrote:

> Instead of NotShowIn, you should ship a desktop file with Hidden=true in /usr/share/upstart/xdg/autostart/ (this directory is prepended to XDG_CONFIG_DIRS under upstart user sessions). This will cause it to not start via XDG autostart exactly when user sessions are in use, which is probably what you really want. Having Unity in there smells a bit.

The problem is the opposite. We want it to start in non-Upstart user
sessions and use the Upstart job in Upstart user sessions.

[Ted Gould (ted)]

review: Approve

[Iain Lane (laney)]

On Fri, Dec 06, 2013 at 10:15:35PM -0000, Ted Gould wrote:
> On Fri, 2013-12-06 at 17:44 +0000, Iain Lane wrote:
>
> > Instead of NotShowIn, you should ship a desktop file with Hidden=true in /usr/share/upstart/xdg/autostart/ (this directory is prepended to XDG_CONFIG_DIRS under upstart user sessions). This will cause it to not start via XDG autostart exactly when user sessions are in use, which is probably what you really want. Having Unity in there smells a bit.
>
>
> The problem is the opposite. We want it to start in non-Upstart user
> sessions and use the Upstart job in Upstart user sessions.

That's what I said.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Iain Lane (laney)]

On Fri, Dec 06, 2013 at 10:21:17PM +0000, Iain Lane wrote:
> On Fri, Dec 06, 2013 at 10:15:35PM -0000, Ted Gould wrote:
> > On Fri, 2013-12-06 at 17:44 +0000, Iain Lane wrote:
> >
> > > Instead of NotShowIn, you should ship a desktop file with Hidden=true in /usr/share/upstart/xdg/autostart/ (this directory is prepended to XDG_CONFIG_DIRS under upstart user sessions). This will cause it to not start via XDG autostart exactly when user sessions are in use, which is probably what you really want. Having Unity in there smells a bit.
> >
> >
> > The problem is the opposite. We want it to start in non-Upstart user
> > sessions and use the Upstart job in Upstart user sessions.
>
> That's what I said.

To be clear, you ship both desktop files. See gnome-settings-daemon for
an example.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Ted Gould (ted)]

On Fri, 2013-12-06 at 22:24 +0000, Iain Lane wrote:

> On Fri, Dec 06, 2013 at 10:21:17PM +0000, Iain Lane wrote:
> > That's what I said.
>
> To be clear, you ship both desktop files. See gnome-settings-daemon for
> an example.

Ah, I see. I was not aware of the override directory in Upstart. Yes,
we should do that for all the indicators. It is better than NoShowIn.

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

78. By Charles Kerr on 2013-12-18

add a second .desktop file to be installed in /usr/share/upstart/xdg/autostart with Hidden=true

79. By Charles Kerr on 2013-12-18

remove NotShowIn=Unity from the main .desktop file

80. By Charles Kerr on 2013-12-18

sync with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

The desktop files look right to me, thanks!

(This is only a visual review)

review: Approve (desktop-files)

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-09 22:11:59 +0000
+++ data/Makefile.am	2013-12-18 12:57:20 +0000
@@ -1,23 +1,53 @@
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
 
 # the indicator bus file
 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
-
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
+# the upstart job file
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-bluetooth.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
+CLEANFILES += $(upstart_jobs_DATA)
+
+# the upstart version of the xdg autostart job file
+# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
+upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
+upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in
+$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
+EXTRA_DIST += $(upstart_xdg_autostart_in)
+CLEANFILES += $(upstart_xdg_autostart_DATA)
+
+# the xdg autostart job file
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-bluetooth.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
+CLEANFILES += $(xdg_autostart_DATA)
+
+# the gsettings schema
 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-EXTRA_DIST = \
-  indicator-bluetooth.service.in \
-  com.canonical.indicator.bluetooth.gschema.xml.in
+EXTRA_DIST += \
+  com.canonical.indicator.bluetooth.gschema.xml.in \
+  indicator-bluetooth.conf.in \
+  indicator-bluetooth.desktop.in \
+  indicator-bluetooth.upstart.desktop.in
 
-CLEANFILES = \
+CLEANFILES += \
   $(dbus_services_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-12-18 12:57:20 +0000
@@ -0,0 +1,11 @@
+description "Indicator Bluetooth Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet. Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-bluetooth-service

=== added file 'data/indicator-bluetooth.desktop.in'
--- data/indicator-bluetooth.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-bluetooth.desktop.in	2013-12-18 12:57:20 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Bluetooth
+Exec=@pkglibexecdir@/indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false

=== 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

=== added file 'data/indicator-bluetooth.upstart.desktop.in'
--- data/indicator-bluetooth.upstart.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-bluetooth.upstart.desktop.in	2013-12-18 12:57:20 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Bluetooth
+Exec=@pkglibexecdir@/indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true