Merge lp:~ted/indicator-sound/upstart-job into lp:indicator-sound/14.04

[Ted Gould]

Switching around the config files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/11

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Needs to be synced with pete's cmake changes.

Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

review: Needs Fixing

[Ted Gould (ted)]

On Tue, 2013-08-27 at 14:42 +0000, Charles Kerr wrote:

> Needs to be synced with pete's cmake changes.
>
> Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

Sorry forgot to push the last version ;-) Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

360. By Ted Gould on 2013-10-29

Forgot a var

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/73/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-08-16 03:58:55 +0000
+++ .bzrignore	2013-10-29 00:54:30 +0000
@@ -1,7 +1,7 @@
 /po/POTFILES
 /po/stamp-it
 
-/data/indicator-sound.service
+/data/indicator-sound.conf
 
 /src/indicator-sound-service
 /src/indicator_sound_service_vala.stamp

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-08-16 03:13:41 +0000
+++ data/CMakeLists.txt	2013-10-29 00:54:30 +0000
@@ -17,23 +17,43 @@
 )
 
 ###########################
-# Dbus Service
-###########################
-
-set(
-  INDICATOR_SOUND_SERVICE
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service"
-)
-
-configure_file(
-  "indicator-sound.service.in"
-  ${INDICATOR_SOUND_SERVICE}
-  @ONLY
-)
-
-install(
-  FILES "${INDICATOR_SOUND_SERVICE}"
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/"
+# Upstart Job
+###########################
+
+set(
+  INDICATOR_SOUND_CONF
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.conf"
+)
+
+configure_file(
+  "indicator-sound.conf.in"
+  ${INDICATOR_SOUND_CONF}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_CONF}"
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/"
+)
+
+###########################
+# XDG Autostart
+###########################
+
+set(
+  INDICATOR_SOUND_XDG_AUTOSTART
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
+)
+
+configure_file(
+  "indicator-sound.desktop.in"
+  ${INDICATOR_SOUND_XDG_AUTOSTART}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
+  DESTINATION "/etc/xdg/autostart"
 )
 
 ###########################

=== added file 'data/indicator-sound.conf.in'
--- data/indicator-sound.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sound.conf.in	2013-10-29 00:54:30 +0000
@@ -0,0 +1,11 @@
+description "Indicator Sound 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 @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service

=== added file 'data/indicator-sound.desktop.in'
--- data/indicator-sound.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sound.desktop.in	2013-10-29 00:54:30 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-sound.service.in'
--- data/indicator-sound.service.in	2013-08-16 03:58:55 +0000
+++ data/indicator-sound.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service