[SCM] charmtimetracker packaging branch, master, updated. upstream/1.10.0-4-g21117fa

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Oct 6 22:50:38 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/charmtimetracker.git;a=commitdiff;h=21117fa

The following commit has been merged in the master branch:
commit 21117fafd2d1ac10c6c8acaee41534b2da92b057
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Wed Oct 7 00:40:07 2015 +0200

    use xvfb-run to run tests
---
 debian/control | 3 ++-
 debian/rules   | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index e9891e1..1406913 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,11 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sandro Knauß <bugs at sandroknauss.de>
 Build-Depends: debhelper (>= 9),
-	       cmake,
+               cmake,
                libqt5sql5-sqlite,
                qtbase5-dev,
                qt5keychain-dev,
+               xauth,
                xvfb
 Standards-Version: 3.9.6
 Homepage: https://github.com/KDAB/Charm
diff --git a/debian/rules b/debian/rules
index a90a583..7373f5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,4 @@ override_dh_auto_configure:
 	-DCharm_VERSION=$(DEB_VERSION_UPSTREAM) -DCMAKE_BUILD_TYPE=Release
 
 override_dh_auto_test:
-	{ \
-	Xvfb :99 & \
-	PID=$$! ; \
-	DISPLAY=:99 dh_auto_test ; \
-	kill -9 $$PID; \
-	}
+	xvfb-run dh_auto_test

-- 
charmtimetracker packaging



More information about the pkg-kde-commits mailing list