From 7d97429147d87f2fb8b1d7861ee31c55fcbb75b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 14 Feb 2014 15:10:24 -0600
Subject: Respawn limit and better rules

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

(limited to 'data')

diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in
index ddc803c..15a318d 100644
--- a/data/indicator-application.conf.in
+++ b/data/indicator-application.conf.in
@@ -3,12 +3,13 @@ description "Indicator Application Service"
 # NOTE: Limiting only to Unity 7 right now as it's still using
 # dbusmenu.  That can be lifted after it is ported to GMenu
 
-start on (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu
+start on indicator-services-start and xsession SESSION=ubuntu
 stop on desktop-end or indicator-services-end
 
 emits appindicators-start appindicators-end
 
 respawn
+respawn limit 2 10
 
 exec @libexecdir@/indicator-application-service
 
-- 
cgit v1.2.3


From cbe78c0c70ec10404da6ec8de61058aa56ae8fd2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 14 Feb 2014 15:24:24 -0600
Subject: Fixing the autostart file

---
 data/indicator-application.desktop.in | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'data')

diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
index 61d3c4d..7a5073b 100644
--- a/data/indicator-application.desktop.in
+++ b/data/indicator-application.desktop.in
@@ -2,8 +2,5 @@
 Type=Application
 Name=Indicator Application
 Exec=@libexecdir@/indicator-application-service
-NotShowIn=Unity;
-NoDisplay=true
 StartupNotify=false
 Terminal=false
-
-- 
cgit v1.2.3


From 4d7566c239afe3c47228d0c249e6377e8d7d5f53 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:10:15 -0600
Subject: Make sure this is for Unity and XFCE

---
 data/indicator-application.desktop.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'data')

diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
index 7a5073b..2783781 100644
--- a/data/indicator-application.desktop.in
+++ b/data/indicator-application.desktop.in
@@ -4,3 +4,4 @@ Name=Indicator Application
 Exec=@libexecdir@/indicator-application-service
 StartupNotify=false
 Terminal=false
+OnlyShowIn=Unity;XFCE;
-- 
cgit v1.2.3


From c6a36f4305d52fb74d9990174fb9c455c01f4014 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:14:06 -0600
Subject: Adding a desktop file for the Upstart override

---
 data/indicator-application.upstart.desktop.in | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 data/indicator-application.upstart.desktop.in

(limited to 'data')

diff --git a/data/indicator-application.upstart.desktop.in b/data/indicator-application.upstart.desktop.in
new file mode 100644
index 0000000..ee1c4a1
--- /dev/null
+++ b/data/indicator-application.upstart.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@libexecdir@/indicator-application-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;XFCE;
+Hidden=true
-- 
cgit v1.2.3


From f179a2c7f91497854fa787eb0c65e547a791f038 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:27:31 -0600
Subject: Build the upstart desktop file in its own directory

---
 data/Makefile.am                              | 2 ++
 data/indicator-application.upstart.desktop.in | 8 --------
 data/upstart/Makefile.am                      | 9 +++++++++
 data/upstart/indicator-application.desktop.in | 8 ++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
 delete mode 100644 data/indicator-application.upstart.desktop.in
 create mode 100644 data/upstart/Makefile.am
 create mode 100644 data/upstart/indicator-application.desktop.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 77ec71d..6f46c2e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,6 @@
 
+SUBDIRS = upstart
+
 upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
diff --git a/data/indicator-application.upstart.desktop.in b/data/indicator-application.upstart.desktop.in
deleted file mode 100644
index ee1c4a1..0000000
--- a/data/indicator-application.upstart.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;XFCE;
-Hidden=true
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..a384c75
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,9 @@
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-application.desktop
+
+%.desktop: %.desktop.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+EXTRA_DIST = \
+	indicator-application.desktop.in
diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in
new file mode 100644
index 0000000..ee1c4a1
--- /dev/null
+++ b/data/upstart/indicator-application.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@libexecdir@/indicator-application-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;XFCE;
+Hidden=true
-- 
cgit v1.2.3


From dd359a11a25e6aa082d405c56c5b1255cd844c76 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:31:05 -0600
Subject: Switch to using pkglibexecdir

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

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 6f46c2e..3f9f7ad 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
 %.conf: %.conf.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = indicator-application.desktop
 
 %.desktop: %.desktop.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in
index 15a318d..d3a103d 100644
--- a/data/indicator-application.conf.in
+++ b/data/indicator-application.conf.in
@@ -11,6 +11,6 @@ emits appindicators-start appindicators-end
 respawn
 respawn limit 2 10
 
-exec @libexecdir@/indicator-application-service
+exec @pkglibexecdir@/indicator-application-service
 
 pre-stop exec initctl emit appindicators-end
diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
index 2783781..c724a0f 100644
--- a/data/indicator-application.desktop.in
+++ b/data/indicator-application.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
+Exec=@pkglibexecdir@/indicator-application-service
 StartupNotify=false
 Terminal=false
 OnlyShowIn=Unity;XFCE;
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index a384c75..f7bc09e 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -1,9 +1,9 @@
 
-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart
 xdg_autostart_DATA = indicator-application.desktop
 
 %.desktop: %.desktop.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@
 
 EXTRA_DIST = \
 	indicator-application.desktop.in
diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in
index ee1c4a1..f4ba076 100644
--- a/data/upstart/indicator-application.desktop.in
+++ b/data/upstart/indicator-application.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
+Exec=@pkglibexecdir@/indicator-application-service
 StartupNotify=false
 Terminal=false
 OnlyShowIn=Unity;XFCE;
-- 
cgit v1.2.3


From e48b26bcffdf75b4454611f88018c1a783c2e9c9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 14:48:59 -0600
Subject: Removes the indicator service code

---
 data/Makefile.am | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 3f9f7ad..b26a669 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
 %.conf: %.conf.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = indicator-application.desktop
 
 %.desktop: %.desktop.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
@@ -22,5 +22,6 @@ EXTRA_DIST = \
 	ordering-override.keyfile
 
 CLEANFILES = \
-	indicator-application.conf
+	indicator-application.conf \
+	indicator-application.desktop
 
-- 
cgit v1.2.3