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

[Ted Gould]

Converting to Upstart job

Upstart jobs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sync-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

38. By Ted Gould on 2013-10-29

Merge trunk

39. By Ted Gould on 2013-10-29

Adding an XDG Autostart File

40. By Ted Gould on 2013-10-29

Install the autostart

Unmerged revisions

40. By Ted Gould on 2013-10-29

Install the autostart

39. By Ted Gould on 2013-10-29

Adding an XDG Autostart File

38. By Ted Gould on 2013-10-29

Merge trunk

37. By Ted Gould on 2013-08-27

Picking up the upstart files in the package

36. By Ted Gould on 2013-08-27

Coverting to Upstart Job

=== modified file 'configure.ac'
--- configure.ac	2013-01-22 20:14:33 +0000
+++ configure.ac	2013-10-29 16:17:42 +0000
@@ -130,17 +130,6 @@
 fi
 AC_SUBST(INDICATORDIR)
 
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
 ##############################
 # Custom Junk
 ##############################

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-09-13 15:27:10 +0000
+++ data/Makefile.am	2013-10-29 16:17:42 +0000
@@ -1,11 +1,21 @@
 SUBDIRS = icons
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-sync.service
-
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-EXTRA_DIST = indicator-sync.service.in
-
-CLEANFILES = indicator-sync.service
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-sync.conf
+
+%.conf: %.conf.in
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-sync.conf
+
+%.desktop: %.desktop.in
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+EXTRA_DIST = \
+	indicator-sync.desktop.in \
+	indicator-sync.conf.in
+
+CLEANFILES = \
+	indicator-sync.desktop \
+	indicator-sync.conf

=== added file 'data/indicator-sync.conf.in'
--- data/indicator-sync.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sync.conf.in	2013-10-29 16:17:42 +0000
@@ -0,0 +1,8 @@
+description "Indicator Sync Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-sync-service

=== added file 'data/indicator-sync.desktop.in'
--- data/indicator-sync.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sync.desktop.in	2013-10-29 16:17:42 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Sync
+Exec=@pkglibexecdir@/indicator-sync-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-sync.service.in'
--- data/indicator-sync.service.in	2012-09-13 15:27:10 +0000
+++ data/indicator-sync.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.sync
-Exec=@pkglibexecdir@/indicator-sync-service

=== modified file 'debian/indicator-sync.install'
--- debian/indicator-sync.install	2012-11-19 15:45:51 +0000
+++ debian/indicator-sync.install	2013-10-29 16:17:42 +0000
@@ -1,4 +1,5 @@
-usr/share/dbus-1
+usr/share/upstart/sessions/*
 usr/share/icons
 usr/lib/indicators3
 usr/lib/*/indicator-sync/indicator-sync-service
+etc/xdg/autostart/*