[SCM] kglobalaccel packaging branch, master, updated. debian/5.25.0-1-3-g9f5d318

Maximiliano Curia maxy at moszumanska.debian.org
Fri Sep 9 14:51:12 UTC 2016


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

The following commit has been merged in the master branch:
commit 4f165108b45320870965b144c2e2951b491b9f00
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 9 15:04:13 2016 +0200

    Move auto_tests to autopkgtest
---
 debian/control         | 4 +---
 debian/rules           | 3 ++-
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 06ae689..97ffbb1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,9 +22,7 @@ Build-Depends: cmake (>= 2.8.12),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.5.0~),
                qttools5-dev (>= 5.4),
-               qttools5-dev-tools (>= 5.4),
-               xauth,
-               xvfb
+               qttools5-dev-tools (>= 5.4)
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/frameworks/kglobalaccel
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kglobalaccel.git
diff --git a/debian/rules b/debian/rules
index 0d3652d..6a79535 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,5 @@ override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5globalaccel5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+	# Disable auto tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 541be7d..09257b8 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, xauth, xvfb
+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

-- 
kglobalaccel packaging



More information about the pkg-kde-commits mailing list