diff options
| author | Ted Gould <ted@gould.cx> | 2014-02-19 22:23:57 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-02-19 22:23:57 -0600 |
| commit | c9d231dfed8063f705b68cf46d7176ecdfb7ca72 (patch) | |
| tree | cceccef6d634ba4e307417d698130d2fca4db4c1 | |
| parent | b6b73be508cbffa2e87ed15b88a622c7c105cdfe (diff) | |
| download | ayatana-indicator-keyboard-c9d231dfed8063f705b68cf46d7176ecdfb7ca72.tar.gz ayatana-indicator-keyboard-c9d231dfed8063f705b68cf46d7176ecdfb7ca72.tar.bz2 ayatana-indicator-keyboard-c9d231dfed8063f705b68cf46d7176ecdfb7ca72.zip | |
Adding an Upstart job configuration
| -rw-r--r-- | data/Makefile.am | 26 | ||||
| -rw-r--r-- | data/indicator-keyboard.conf.in | 9 |
2 files changed, 34 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index a6549e93..9c42ccf0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,7 @@ +########################### +# Icon Generator +########################### + noinst_PROGRAMS = indicator-keyboard-icon-generator AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API @@ -32,6 +36,20 @@ indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS) \ $(LIBXKLAVIER_LIBS) \ $(COVERAGE_LDFLAGS) +########################### +# Upstart Config +########################### + +upstart_jobsdir = $(datadir)/upstart/sessions/ +upstart_jobs_DATA = indicator-keyboard.conf + +%.conf: %.conf.in + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +########################### +# Indicator Config +########################### + dist_indicator_DATA = com.canonical.indicator.keyboard indicatordir = $(INDICATOR_DIR) @@ -51,6 +69,10 @@ com.canonical.indicator.keyboard: echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \ mv $@.tmp $@ +########################### +# GSettings Schemas +########################### + gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml @GSETTINGS_RULES@ @@ -62,4 +84,6 @@ gschemas.compiled: $(gsettings_SCHEMAS) EXTRA_DIST = $(dist_service_DATA) \ $(dist_indicator_DATA) \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + indicator-keyboard.conf.in + diff --git a/data/indicator-keyboard.conf.in b/data/indicator-keyboard.conf.in new file mode 100644 index 00000000..0becdf09 --- /dev/null +++ b/data/indicator-keyboard.conf.in @@ -0,0 +1,9 @@ +description "Indicator Keyboard Backend" + +start on indicator-services-start +stop on desktop-end or indicator-services-end + +respawn +respawn limit 2 10 + +exec @libexecdir@/indicator-keyboard-service --use-gtk |