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/upstart/indicator-keyboard.desktop.in | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 data/upstart/indicator-keyboard.desktop.in

(limited to 'data/upstart')

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/upstart')

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/upstart/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/upstart')

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/upstart')

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