From 1d8adeb255e0499ba27508be0530827fe0c052db Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sun, 16 Jun 2013 23:18:11 -0500
Subject: add power.indicator

---
 data/power.indicator | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 data/power.indicator

(limited to 'data')

diff --git a/data/power.indicator b/data/power.indicator
new file mode 100644
index 0000000..1ebc075
--- /dev/null
+++ b/data/power.indicator
@@ -0,0 +1,9 @@
+[Indicator Service]
+Name=indicator-power
+ObjectPath=/com/canonical/indicator/power
+
+[desktop]
+ObjectPath=/com/canonical/indicator/power/desktop
+
+[greeter]
+ObjectPath=/com/canonical/indicator/power/greeter
-- 
cgit v1.2.3


From eeb37d127e5bd3d34735b56c678ad1fd931d8034 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 18 Jun 2013 21:28:30 -0500
Subject: install the .indicator file into share/unity/indicators/

---
 data/Makefile.am                   | 12 ++++++++++++
 data/com.canonical.indicator.power |  9 +++++++++
 data/power.indicator               |  9 ---------
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 data/com.canonical.indicator.power
 delete mode 100644 data/power.indicator

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 375c7ca..3143881 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,18 @@
 
+#
+# the indicator bus file
+#
+
+indicatorsdir = $(prefix)/share/unity/indicators
+indicators_DATA = com.canonical.indicator.power
+
+#
+# the gettings
+#
+
 gsettings_in_file = com.canonical.indicator.power.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+CLEANFILES += $(gsettings_SCHEMAS)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/com.canonical.indicator.power b/data/com.canonical.indicator.power
new file mode 100644
index 0000000..1ebc075
--- /dev/null
+++ b/data/com.canonical.indicator.power
@@ -0,0 +1,9 @@
+[Indicator Service]
+Name=indicator-power
+ObjectPath=/com/canonical/indicator/power
+
+[desktop]
+ObjectPath=/com/canonical/indicator/power/desktop
+
+[greeter]
+ObjectPath=/com/canonical/indicator/power/greeter
diff --git a/data/power.indicator b/data/power.indicator
deleted file mode 100644
index 1ebc075..0000000
--- a/data/power.indicator
+++ /dev/null
@@ -1,9 +0,0 @@
-[Indicator Service]
-Name=indicator-power
-ObjectPath=/com/canonical/indicator/power
-
-[desktop]
-ObjectPath=/com/canonical/indicator/power/desktop
-
-[greeter]
-ObjectPath=/com/canonical/indicator/power/greeter
-- 
cgit v1.2.3


From f566ca0df0de10f82601d7fad7fd438c8f6963e3 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 19 Jun 2013 00:29:55 -0500
Subject: add a dbus service file for indicator-power...

---
 configure.ac                    |  9 +++++++++
 data/Makefile.am                | 20 ++++++++++++++++++--
 data/indicator-power.service.in |  3 +++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 data/indicator-power.service.in

(limited to 'data')

diff --git a/configure.ac b/configure.ac
index 20462fa..84e9423 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,15 @@ AC_ARG_ENABLE([localinstall],
               [with_localinstall=$enableval],
               [with_localinstall=no])
 
+###########################
+# DBus Service Info
+###########################
+
+AS_IF([test "x$with_localinstall" = "xyes"],
+      [DBUSSERVICEDIR="${datadir}/dbus-1/services/"],
+      [DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`])
+AC_SUBST(DBUSSERVICEDIR)
+
 ##############################
 # Custom Junk
 ##############################
diff --git a/data/Makefile.am b/data/Makefile.am
index 3143881..c2ce65d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,26 @@
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
 
 #
 # the indicator bus file
 #
 
 indicatorsdir = $(prefix)/share/unity/indicators
-indicators_DATA = com.canonical.indicator.power
+dist_indicators_DATA = com.canonical.indicator.power
+
+#
+# the dbus service file
+#
+
+dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_services_DATA = indicator-power.service
+dbus_services_in = $(dbus_services_DATA:.service=.service.in)
+$(dbus_services_DATA): $(dbus_services_in)
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+BUILT_SOURCES += $(dbus_services_DATA)
+CLEANFILES += $(dbus_services_DATA)
+EXTRA_DIST += $(dbus_services_in)
 
 #
 # the gettings
@@ -22,7 +38,7 @@ dist_noinst_DATA = \
 	com.canonical.indicator.power.gschema.xml \
 	$(gsettings_in_file)
 
-CLEANFILES = \
+CLEANFILES += \
 	$(gsettings_SCHEMAS)
 
 MAINTAINERCLEANFILES = \
diff --git a/data/indicator-power.service.in b/data/indicator-power.service.in
new file mode 100644
index 0000000..c59c69e
--- /dev/null
+++ b/data/indicator-power.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.indicator.power
+Exec=@libexecdir@/indicator-power-service
-- 
cgit v1.2.3