diff options
| -rw-r--r-- | data/Makefile.am | 16 | ||||
| -rw-r--r-- | data/indicator-datetime.conf.in | 8 | ||||
| -rw-r--r-- | data/indicator-datetime.service.in | 3 | ||||
| -rw-r--r-- | debian/indicator-datetime.install | 2 |
4 files changed, 17 insertions, 12 deletions
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..e53fc1c --- /dev/null +++ b/data/indicator-datetime.conf.in @@ -0,0 +1,8 @@ +description "Indicator Date & Time Backend" + +start on indicators-loaded or indicator-services-start +stop on desktop-end or indicator-services-end + +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 diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install index 13d21f2..3a4a108 100644 --- a/debian/indicator-datetime.install +++ b/debian/indicator-datetime.install @@ -1,5 +1,5 @@ usr/share/glib-2.0/schemas/* -usr/share/dbus-1/services/* +usr/share/upstart/sessions/* usr/share/unity/indicators/* usr/lib/*/indicator-datetime-service usr/share/locale/* |