sync with lp:indicator-power

3 files changed, 11 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 1953488..502975c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-power (12.10.6+14.10.20140718-0ubuntu1) utopic; urgency=low
+
+  [ Charles Kerr ]
+  * Switch from automake/autoconf to CMake.
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 18 Jul 2014 21:33:30 +0000
+
 indicator-power (12.10.6+14.10.20140624-0ubuntu1) utopic; urgency=low
 
   [ Alberto Aguirre ]
diff --git a/debian/control b/debian/control
index 68df8bc..4571741 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: indicator-power
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               autopoint,
+Build-Depends: cmake,
+               debhelper (>= 9),
+               dh-translations,
                intltool,
                libnotify-dev (>= 0.7.6),
                libgtest-dev,
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