From beb91ed2bfa4e53212ebab6ecfccfe60b24c0f3d Mon Sep 17 00:00:00 2001 From: Ted Gould 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 From daf88572eaf863912e4ff836d6caa739aa98c3e1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 13:20:52 -0500 Subject: Adding into the package --- debian/indicator-datetime.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/* -- cgit v1.2.3 From 0fa8138427d8469eb2f6a90b0291dbdc4507c8fb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 15:11:08 -0500 Subject: Dropping debugging for system-wide support --- data/indicator-datetime.conf.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/indicator-datetime.conf.in b/data/indicator-datetime.conf.in index 38d21b5..e53fc1c 100644 --- a/data/indicator-datetime.conf.in +++ b/data/indicator-datetime.conf.in @@ -3,9 +3,6 @@ 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 -- cgit v1.2.3 From 83f4d6b7855edfa8db0951d22d429cbcec946c99 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Oct 2013 17:15:33 -0700 Subject: Add in support for XDG Autostart --- data/Makefile.am | 13 +++++++++++++ data/indicator-datetime.desktop.in | 9 +++++++++ 2 files changed, 22 insertions(+) create mode 100644 data/indicator-datetime.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index 1875716..daaac51 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -30,6 +30,19 @@ BUILT_SOURCES += $(upstart_jobs_DATA) CLEANFILES += $(upstart_jobs_DATA) EXTRA_DIST += $(upstart_jobs_in) +# +# the xdg autostart job file +# + +xdg_autostartdir = /etc/xdg/autostart +xdg_autostart_DATA = indicator-datetime.desktop +xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in) +$(xdg_autostart_DATA): $(xdg_autostart_in) + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +BUILT_SOURCES += $(xdg_autostart_DATA) +CLEANFILES += $(xdg_autostart_DATA) +EXTRA_DIST += $(xdg_autostart_in) + # # the gnome-control-center panel # diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in new file mode 100644 index 0000000..90ea7f0 --- /dev/null +++ b/data/indicator-datetime.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Date & Time +Exec=@libexecdir@/indicator-datetime-service +NotShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false + -- cgit v1.2.3 From 8cd9a9cad7d1333b01e3f0bcbe79936161193eb1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Oct 2013 17:17:12 -0700 Subject: Install the autostart file --- debian/indicator-datetime.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install index 3a4a108..a3076ee 100644 --- a/debian/indicator-datetime.install +++ b/debian/indicator-datetime.install @@ -3,3 +3,4 @@ usr/share/upstart/sessions/* usr/share/unity/indicators/* usr/lib/*/indicator-datetime-service usr/share/locale/* +etc/xdg/autostart/* -- cgit v1.2.3 From a4a5562fd93fdd6d9cb4b9cde98126fdca3ea21d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Oct 2013 17:19:13 -0700 Subject: Ignore generated files --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 3f718b3..5bca87f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -15,3 +15,5 @@ src/gen-datetime-service.xml.h build-aux data/com.canonical.indicator.datetime.gschema.valid src/libdatetime_la-utils.lo +data/indicator-datetime.conf +data/indicator-datetime.desktop -- cgit v1.2.3 From 49aa770cc1687267aca324b895ac5556457350a6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 31 Oct 2013 11:41:36 -0700 Subject: Autostart directory --- data/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 1bd74d6..ab393a7 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -33,7 +33,7 @@ install (FILES "${UPSTART_JOB_FILE}" ## # where to install -set (XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services") +set (XDG_AUTOSTART_DIR "/etc/xdg/autostart") message (STATUS "${XDG_AUTOSTART_DIR} is the DBus Service File install dir") set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop") -- cgit v1.2.3