From 3035b8d90bb8cd3b4a5a75f2014aa4ffdeb42abe Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Date: Wed, 23 Jul 2014 17:32:49 +0100
Subject: use override targets

---
 packages/debian/rules | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/debian/rules b/packages/debian/rules
index 6bf78377..6c3bf526 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
 INIT_SYSTEM ?= upstart,systemd
-export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
-export PYBUILD_TEST_NOSE=1
 
 %:
 	dh $@ --with python2,systemd --buildsystem pybuild
@@ -11,3 +9,9 @@ override_dh_install:
 	dh_install
 	install -d debian/cloud-init/etc/rsyslog.d
 	cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+
+override_dh_auto_test:
+	http_proxy= dh_auto_test -- --test-nose
+
+override_dh_auto_install:
+	dh_auto_install -- --init-system=$(INIT_SYSTEM)
-- 
cgit v1.2.3