From 9b460b3221d83a51e4ae49d7277cd399238a7bca Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Wed, 3 Apr 2013 15:31:45 -0400
Subject: Autogen indicator-keyboard.{indicator,service}.

---
 configure.ac                       |  1 -
 data/Makefile.am                   | 13 +++++++++++++
 data/indicator-keyboard.indicator  |  4 ----
 data/indicator-keyboard.service.in |  3 ---
 debian/control                     |  2 +-
 debian/rules                       |  2 +-
 6 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 data/indicator-keyboard.indicator
 delete mode 100644 data/indicator-keyboard.service.in

diff --git a/configure.ac b/configure.ac
index ecd5a7b9..1e2ad1e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,6 @@ AC_SUBST([IBUS_LIBS])
 
 AC_CONFIG_FILES([Makefile
                  data/Makefile
-                 data/indicator-keyboard.service
                  lib/Makefile])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 86959845..6171aaf0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,20 @@
 servicedir = $(DBUS_SERVICE_DIR)
 dist_service_DATA = indicator-keyboard.service
 
+indicator-keyboard.service:
+	$(AM_V_GEN) (echo '[D-BUS Service]';                                           \
+	             echo 'Name=com.canonical.indicator.keyboard';                     \
+	             echo 'Exec=${libexecdir}/indicator-keyboard-service') > $@.tmp && \
+	            mv $@.tmp $@
+
 indicatordir = $(INDICATOR_DIR)
 dist_indicator_DATA = indicator-keyboard.indicator
 
+indicator-keyboard.indicator:
+	$(AM_V_GEN) (echo '[Indicator Service]';                                      \
+	             echo 'Name=indicator-keyboard';                                  \
+	             echo 'BusName=com.canonical.indicator.keyboard';                 \
+	             echo 'ObjectPath=/com/canonical/indicator/keyboard') > $@.tmp && \
+	            mv $@.tmp $@
+
 EXTRA_DIST = $(dist_service_DATA) $(dist_indicator_DATA)
diff --git a/data/indicator-keyboard.indicator b/data/indicator-keyboard.indicator
deleted file mode 100644
index 8f2cab12..00000000
--- a/data/indicator-keyboard.indicator
+++ /dev/null
@@ -1,4 +0,0 @@
-[Indicator Service]
-Name=indicator-keyboard
-BusName=com.canonical.indicator.keyboard
-ObjectPath=/com/canonical/indicator/keyboard
diff --git a/data/indicator-keyboard.service.in b/data/indicator-keyboard.service.in
deleted file mode 100644
index 775f00bc..00000000
--- a/data/indicator-keyboard.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.keyboard
-Exec=@libexecdir@/indicator-keyboard-service
diff --git a/debian/control b/debian/control
index 7e796b1f..f8290195 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: indicator-keyboard
 Section: gnome
 Priority: extra
 Maintainer: William Hua <william.hua@canonical.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev
+Build-Depends: debhelper (>= 8.0.0), dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: https://code.launchpad.net/~attente/+junk/indicator-keyboard
 #Vcs-Git: git://git.debian.org/collab-maint/indicator-keyboard.git
diff --git a/debian/rules b/debian/rules
index 312e24d2..85ce4e29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with autotools-dev
+	dh $@ --with autoreconf
-- 
cgit v1.2.3