From beb91ed2bfa4e53212ebab6ecfccfe60b24c0f3d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 27 Aug 2013 13:20:17 -0500
Subject: Adding the upstart job configuration

---
 data/Makefile.am                   | 16 ++++++++--------
 data/indicator-datetime.conf.in    | 11 +++++++++++
 data/indicator-datetime.service.in |  3 ---
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 data/indicator-datetime.conf.in
 delete mode 100644 data/indicator-datetime.service.in

diff --git a/data/Makefile.am b/data/Makefile.am
index 9bcac72..1875716 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,17 +18,17 @@ gsettings_SCHEMAS = com.canonical.indicator.datetime.gschema.xml
 EXTRA_DIST += $(gsettings_SCHEMAS)
 
 #
-# the dbus service file
+# the upstart job file
 #
 
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-datetime.service
-dbus_services_in = $(dbus_services_DATA:.service=.service.in)
-$(dbus_services_DATA): $(dbus_services_in)
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-datetime.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-BUILT_SOURCES += $(dbus_services_DATA)
-CLEANFILES += $(dbus_services_DATA)
-EXTRA_DIST += $(dbus_services_in)
+BUILT_SOURCES += $(upstart_jobs_DATA)
+CLEANFILES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
 
 #
 # the gnome-control-center panel
diff --git a/data/indicator-datetime.conf.in b/data/indicator-datetime.conf.in
new file mode 100644
index 0000000..38d21b5
--- /dev/null
+++ b/data/indicator-datetime.conf.in
@@ -0,0 +1,11 @@
+description "Indicator Date & Time Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+env G_MESSAGES_DEBUG=all
+export G_MESSAGES_DEBUG
+
+respawn
+
+exec @libexecdir@/indicator-datetime-service
diff --git a/data/indicator-datetime.service.in b/data/indicator-datetime.service.in
deleted file mode 100644
index e7735ce..0000000
--- a/data/indicator-datetime.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.datetime
-Exec=@libexecdir@/indicator-datetime-service
-- 
cgit v1.2.3