From bf09f85b2c285c19aad247e8f91b26a7c2007159 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 08:56:38 -0600
Subject: Make the Upstart job match

---
 data/indicator-power.conf.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/data/indicator-power.conf.in b/data/indicator-power.conf.in
index a2bc7aa..665fb35 100644
--- a/data/indicator-power.conf.in
+++ b/data/indicator-power.conf.in
@@ -1,11 +1,9 @@
-description "Indicator Power Backend"
+description "Indicator Power Service"
 
-# Want to move to indicator-services-[start|end], but that's not all
-# there yet.  Use the signals that exist today for now.
-
-start on indicators-loaded or indicator-services-start
+start on indicator-services-start
 stop on desktop-end or indicator-services-end
 
 respawn
+respawn limit 2 10
 
 exec @pkglibexecdir@/indicator-power-service
-- 
cgit v1.2.3


From 87f8929bab1340f1044ce6e6fe5309acb5ab9dd3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 08:57:02 -0600
Subject: Make it only show in Unity

---
 data/indicator-power.desktop.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/indicator-power.desktop.in b/data/indicator-power.desktop.in
index 28025a2..3b93d08 100644
--- a/data/indicator-power.desktop.in
+++ b/data/indicator-power.desktop.in
@@ -2,8 +2,7 @@
 Type=Application
 Name=Indicator Power
 Exec=@pkglibexecdir@/indicator-power-service
-NotShowIn=Unity;
+OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-
-- 
cgit v1.2.3


From 6f4bbf0bac764ad82d884f9768d45038acdf3924 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 08:59:27 -0600
Subject: Add the Upstart override

---
 configure.ac                            |  1 +
 data/upstart/Makefile.am                | 17 +++++++++++++++++
 data/upstart/indicator-power.desktop.in |  9 +++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 data/upstart/Makefile.am
 create mode 100644 data/upstart/indicator-power.desktop.in

diff --git a/configure.ac b/configure.ac
index ca7e793..30aa0d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,6 +118,7 @@ AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 data/Makefile
+data/upstart/Makefile
 src/Makefile
 tests/Makefile
 ])
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..1259a88
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,17 @@
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
+
+#
+# the upstart xdg autostart override
+#
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-power.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+CLEANFILES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
+
diff --git a/data/upstart/indicator-power.desktop.in b/data/upstart/indicator-power.desktop.in
new file mode 100644
index 0000000..08ce2fa
--- /dev/null
+++ b/data/upstart/indicator-power.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


From d7f93a79eb0c426f85718b191de2e1db84d995fe Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:01:34 -0600
Subject: Make sure to go into that subdirectory

---
 data/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/Makefile.am b/data/Makefile.am
index 9a4caca..6ecd4c5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,8 @@ BUILT_SOURCES=
 CLEANFILES=
 EXTRA_DIST=
 
+SUBDIRS = upstart
+
 #
 # the indicator bus file
 #
-- 
cgit v1.2.3


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

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

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


From cc51d0fc02f2980cc08fcd6cfc929ea61ff9d93a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 5 Jun 2014 10:15:32 -0500
Subject: Adding lcov 1.11

---
 m4/gcov.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/gcov.m4 b/m4/gcov.m4
index 2d0b4bb..bd96386 100644
--- a/m4/gcov.m4
+++ b/m4/gcov.m4
@@ -30,7 +30,7 @@ AC_DEFUN([AC_TDD_GCOV],
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
 
-- 
cgit v1.2.3