[SCM] ktextwidgets packaging branch, master, updated. debian/5.26.0-1-1-gb1c6f0f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b1c6f0f01ffefb1dbd88499ee13b53e0158ce107
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 30 10:23:36 2016 +0200

    Disable auto tests at build time
    
    Tests are failing in s390x, probably related to an opengl issue in xvfb, disable for now.
---
 debian/changelog       | 6 ++++++
 debian/control         | 4 +---
 debian/rules           | 3 ++-
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 079b1bf..487a1aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ktextwidgets (5.26.0-2) unstable; urgency=medium
+
+  * Disable auto tests at build time
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Sep 2016 10:21:50 +0200
+
 ktextwidgets (5.26.0-1) unstable; urgency=medium
 
   [ Automatic packaging ]
diff --git a/debian/control b/debian/control
index 9578a5b..be0878a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,7 @@ Build-Depends: cmake (>= 2.8.10.20130309),
                libkf5widgetsaddons-dev (>= 5.26.0~),
                libkf5windowsystem-dev (>= 5.26.0~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.5.0~),
-               xauth,
-               xvfb
+               qtbase5-dev (>= 5.5.0~)
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/frameworks/ktextwidgets
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/ktextwidgets.git
diff --git a/debian/rules b/debian/rules
index cd9321a..154188b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,5 @@ override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5textwidgets5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+	# Disable tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 541be7d..a3be0aa 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, xvfb, xauth
+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

-- 
ktextwidgets packaging