[SCM] plasma-framework packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g9f5b73f

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=a91a56f

The following commit has been merged in the kubuntu_wily_archive branch:
commit a91a56fa609e2a589bdde4015f49bfddac632102
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Mar 22 09:20:30 2015 +0100

    Use adt to run the testsuite
---
 debian/rules           | 3 ++-
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 664b59d..f8208ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,5 @@ override_dh_strip:
 	$(overridden_command) --dbg-package=plasma-framework-dbg
 
 override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+	# Disable dh_auto_test at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index d9b40f1..c117429 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
+Tests: testsuite
+Depends: @, xvfb, dbus-x11
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..f6083b5 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-dh_auto_test
+xvfb-run -a dh_auto_test

-- 
plasma-framework packaging