From b6b73be508cbffa2e87ed15b88a622c7c105cdfe Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:18:44 -0600
Subject: Dropping the registration as a DBus service

---
 data/Makefile.am | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 4f0b7175..a6549e93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -32,15 +32,6 @@ indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS)         \
                                             $(LIBXKLAVIER_LIBS)   \
                                             $(COVERAGE_LDFLAGS)
 
-dist_service_DATA = indicator-keyboard.service
-servicedir = $(DBUS_SERVICE_DIR)
-
-indicator-keyboard.service:
-	$(AM_V_GEN) (echo '[D-BUS Service]';                                                     \
-	             echo 'Name=com.canonical.indicator.keyboard';                               \
-	             echo 'Exec=${libexecdir}/indicator-keyboard-service --use-gtk') > $@.tmp && \
-	            mv $@.tmp $@
-
 dist_indicator_DATA = com.canonical.indicator.keyboard
 indicatordir = $(INDICATOR_DIR)
 
-- 
cgit v1.2.3


From c9d231dfed8063f705b68cf46d7176ecdfb7ca72 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:23:57 -0600
Subject: Adding an Upstart job configuration

---
 data/Makefile.am                | 26 +++++++++++++++++++++++++-
 data/indicator-keyboard.conf.in |  9 +++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 data/indicator-keyboard.conf.in

(limited to 'data')

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
-- 
cgit v1.2.3


From 20ef67d77138f70a0cd637189acf4c606da2773c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:34:41 -0600
Subject: Add in the upstart xdg override

---
 data/Makefile.am                           | 16 +++++++++++++++-
 data/indicator-keyboard.desktop.in         |  8 ++++++++
 data/upstart/indicator-keyboard.desktop.in |  9 +++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 data/indicator-keyboard.desktop.in
 create mode 100644 data/upstart/indicator-keyboard.desktop.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 9c42ccf0..91c94dfb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,6 @@
+
+SUBDIRS = upstart
+
 ###########################
 # Icon Generator
 ###########################
@@ -46,6 +49,16 @@ upstart_jobs_DATA = indicator-keyboard.conf
 %.conf: %.conf.in
 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
+###########################
+# XDG Autostart File
+###########################
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-keyboard.desktop
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
 ###########################
 # Indicator Config
 ###########################
@@ -85,5 +98,6 @@ gschemas.compiled: $(gsettings_SCHEMAS)
 EXTRA_DIST = $(dist_service_DATA)   \
 	     $(dist_indicator_DATA) \
 	     $(gsettings_SCHEMAS) \
-	     indicator-keyboard.conf.in
+	     indicator-keyboard.conf.in \
+	     indicator-keyboard.desktop.in
 
diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in
new file mode 100644
index 00000000..9c611160
--- /dev/null
+++ b/data/indicator-keyboard.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Keyboard
+Exec=@libexecdir@/indicator-keyboard-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
diff --git a/data/upstart/indicator-keyboard.desktop.in b/data/upstart/indicator-keyboard.desktop.in
new file mode 100644
index 00000000..229199f1
--- /dev/null
+++ b/data/upstart/indicator-keyboard.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Keyboard
+Exec=@libexecdir@/indicator-keyboard-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


From 8741f59aa09687eb3f49399afe513e7664e08774 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:35:00 -0600
Subject: Grab the makefile config too

---
 data/upstart/Makefile.am | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 data/upstart/Makefile.am

(limited to 'data')

diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 00000000..3cf55624
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,12 @@
+###########################
+# Upstart XDG Override
+###########################
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-keyboard.desktop
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+EXTRA_DIST = indicator-keyboard.desktop.in
+
-- 
cgit v1.2.3


From 76ab6be0d02f82a95528e0d95ca2c80f85ecd39b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:39:39 -0600
Subject: Switch to pkglibexecdir

---
 data/Makefile.am                   | 4 ++--
 data/indicator-keyboard.conf.in    | 2 +-
 data/indicator-keyboard.desktop.in | 2 +-
 data/upstart/Makefile.am           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 91c94dfb..ae1d9b0f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -47,7 +47,7 @@ upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-keyboard.conf
 
 %.conf: %.conf.in
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 ###########################
 # XDG Autostart File
@@ -57,7 +57,7 @@ xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = indicator-keyboard.desktop
 
 %.desktop: %.desktop.in
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 ###########################
 # Indicator Config
diff --git a/data/indicator-keyboard.conf.in b/data/indicator-keyboard.conf.in
index 0becdf09..737a4830 100644
--- a/data/indicator-keyboard.conf.in
+++ b/data/indicator-keyboard.conf.in
@@ -6,4 +6,4 @@ stop on desktop-end or indicator-services-end
 respawn
 respawn limit 2 10
 
-exec @libexecdir@/indicator-keyboard-service --use-gtk
+exec @pkglibexecdir@/indicator-keyboard-service --use-gtk
diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in
index 9c611160..fc55aa20 100644
--- a/data/indicator-keyboard.desktop.in
+++ b/data/indicator-keyboard.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Keyboard
-Exec=@libexecdir@/indicator-keyboard-service
+Exec=@pkglibexecdir@/indicator-keyboard-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index 3cf55624..c0b6a2eb 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -6,7 +6,7 @@ xdg_autostartdir = $(datadir)/upstart/xdg/autostart
 xdg_autostart_DATA = indicator-keyboard.desktop
 
 %.desktop: %.desktop.in
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 EXTRA_DIST = indicator-keyboard.desktop.in
 
-- 
cgit v1.2.3


From dfcdd9755392406d74a98228d14cf8427a04c618 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:40:34 -0600
Subject: Forgot one

---
 data/upstart/indicator-keyboard.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/upstart/indicator-keyboard.desktop.in b/data/upstart/indicator-keyboard.desktop.in
index 229199f1..ec7e565c 100644
--- a/data/upstart/indicator-keyboard.desktop.in
+++ b/data/upstart/indicator-keyboard.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Keyboard
-Exec=@libexecdir@/indicator-keyboard-service
+Exec=@pkglibexecdir@/indicator-keyboard-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
-- 
cgit v1.2.3


From e17991a23d176b7ab26e786d01819df24f529cff Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Feb 2014 10:35:15 -0600
Subject: Update for gnome-fallback

---
 data/indicator-keyboard.desktop.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in
index fc55aa20..3fca71fb 100644
--- a/data/indicator-keyboard.desktop.in
+++ b/data/indicator-keyboard.desktop.in
@@ -2,7 +2,8 @@
 Type=Application
 Name=Indicator Keyboard
 Exec=@pkglibexecdir@/indicator-keyboard-service
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;GNOME;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
+AutostartCondition=GNOME3 unless-session gnome
-- 
cgit v1.2.3