Merge lp:~xnox/indicator-sound/unbreak-ubiquity into lp:indicator-sound/14.04

[Dimitri John Ledkov]

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:407
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/indicator-sound/unbreak-ubiquity/+merge/198170/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

I don't think we need the DBus activation. If it is started by the XDG Autostart or Upstart, it seems that should cover all cases.

Also, we should drop the NoShowIn in the XDG Autostart file for Unity as it would get picked up by the override.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Yes, we don't need all three. Looking into it more, I think we actually want: upstart & dbus activation.

XDG Autostart was not used in any of the previous releases, and neither lightdm nor ubiquity spawns gnome-session/upstart-user-session to autostart them. So I think upstart jobs + dbus activation should cover all cases, without imposing upstart to use the indicators. (but upstart is used where possible, which all Ubuntu standard flavours).

I'll priorities to get dbus-upstart activation done rather sooner than later, to close the gap between dbus-activation & upstart job.

Are you ok to reintroduce dbus activation? (that service file will be needed to integrate with dbus-activation as well, it will simply gain additional UpstartJob=indicator-sound)

W.r.t. upstart-job itself, I would have expected indicators to start on "started indicator-service" and stop on "stopped indicator-service", why is there an artificial sync point "indiator-services-start|end" ? is it reliably emitted when indicator-service dies?

[lp:~xnox/indicator-sound/unbreak-ubiquity]

406. By Dimitri John Ledkov on 2013-12-08

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

Unmerged revisions

406. By Dimitri John Ledkov on 2013-12-08

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

=== modified file '.bzrignore'
--- .bzrignore	2013-08-27 15:58:07 +0000
+++ .bzrignore	2013-12-08 20:13:30 +0000
@@ -2,6 +2,7 @@
 /po/stamp-it
 
 /data/indicator-sound.conf
+/data/indicator-sound.service
 
 /src/indicator-sound-service
 /src/indicator_sound_service_vala.stamp

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-10-29 00:54:09 +0000
+++ data/CMakeLists.txt	2013-12-08 20:13:30 +0000
@@ -37,23 +37,23 @@
 )
 
 ###########################
-# XDG Autostart
+# Dbus Service
 ###########################
 
 set(
-  INDICATOR_SOUND_XDG_AUTOSTART
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
+  INDICATOR_SOUND_SERVICE
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service"
 )
 
 configure_file(
-  "indicator-sound.desktop.in"
-  ${INDICATOR_SOUND_XDG_AUTOSTART}
+  "indicator-sound.service.in"
+  ${INDICATOR_SOUND_SERVICE}
   @ONLY
 )
 
 install(
-  FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
-  DESTINATION "/etc/xdg/autostart"
+  FILES "${INDICATOR_SOUND_SERVICE}"
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/"
 )
 
 ###########################

=== added file 'data/indicator-sound.service.in'
--- data/indicator-sound.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sound.service.in	2013-12-08 20:13:30 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.indicator.sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-25 03:56:15 +0000
+++ debian/changelog	2013-12-08 20:13:30 +0000
@@ -1,3 +1,10 @@
+indicator-sound (12.10.2+14.04.20131125-0ubuntu2) UNRELEASED; urgency=low
+
+  * Resolve broken indicator under ubiquity (LP: #1258863):
+    - Reintroduce dbus activation file.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Sun, 08 Dec 2013 04:08:48 +0000
+
 indicator-sound (12.10.2+14.04.20131125-0ubuntu1) trusty; urgency=low
 
   [ Ted Gould ]