[SCM] plasma-workspace packaging branch, master, updated. debian/5.4.0-2-4-g8a71a4f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ebcc51378213f2b6dd542c2c340f45768cf77525
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 00:36:03 2015 +0200

    Move auto test to autopkgtests.
---
 debian/changelog       | 2 +-
 debian/control         | 5 +----
 debian/rules           | 4 ++--
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 3 ++-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0850a57..a6a174c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 plasma-workspace (4:5.4.0-3~) UNRELEASED; urgency=medium
 
-  * 
+  * Move auto test to autopkgtests.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Sep 2015 00:34:50 +0200
 
diff --git a/debian/control b/debian/control
index 427f329..0e42258 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: baloo-kf5-dev (>= 5.13~),
                cmake (>= 2.8.12),
-               dbus-x11,
                debhelper (>= 9),
                extra-cmake-modules (>= 1.8.0~),
                kdoctools-dev (>= 5.13.0~),
@@ -74,9 +73,7 @@ Build-Depends: baloo-kf5-dev (>= 5.13~),
                qtdeclarative5-dev (>= 5.4.0~),
                qtscript5-dev (>= 5.4.0~),
                qttools5-dev (>= 5.4),
-               xauth,
-               xcb-proto,
-               xvfb
+               xcb-proto
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/kde/workspace/plasma-workspace
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/plasma-workspace.git
diff --git a/debian/rules b/debian/rules
index 2dfe906..da8a0c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,8 @@ libpkgs_addsubst_allLibraries = plasma-workspace-dev
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
 override_dh_auto_test:
-	xvfb-run -a --server-args="-screen 0 1024x768x24" \
-	    dbus-launch --exit-with-session dh_auto_test
+	# Disable auto tests at build time
+	:
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=plasma-workspace-dbg
diff --git a/debian/tests/control b/debian/tests/control
index d9b40f1..c2abe22 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: @, @builddeps@, build-essential, dbus-x11, xauth, xvfb
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..c959362 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-dh_auto_test
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    dbus-launch --exit-with-session dh_auto_test

-- 
plasma-workspace packaging