From fb4c324c76176b248c40bce6f151bd397f8e09fb Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 15 Apr 2014 14:43:09 +0100
Subject: Don't build the tests when cross compiling, they fail to build

AC_CHECK_FILES doesn't work when cross building for some reason. But we don't
run the tests in this situation anyway, so don't worry about it.
---
 debian/rules | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 83edd94..36a22d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,21 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	TESTS=yes
+else
+	TESTS=no
+endif
+
 %:
 	dh $@ --with autoreconf
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-tests=$(TESTS)
+
 override_dh_install:
 	find debian/indicator-power -name \*.la -delete
 	find debian/indicator-power -name \*.a -delete
-- 
cgit v1.2.3


From 69081d46fe77f2c8bd18dd56e6dbc7a3ceb0ee28 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 16 Jul 2014 18:28:24 -0500
Subject: in debian/rules, remove autotool-specific bits

---
 debian/rules | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 36a22d7..885b94c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,20 +6,8 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	TESTS=yes
-else
-	TESTS=no
-endif
-
 %:
-	dh $@ --with autoreconf
-
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-
-override_dh_auto_configure:
-	dh_auto_configure -- --enable-tests=$(TESTS)
+	dh $@ --with translations
 
 override_dh_install:
 	find debian/indicator-power -name \*.la -delete
-- 
cgit v1.2.3