[SCM] qtsvg packaging branch, master, updated. debian/5.3.1-1-2-g7c3a1e0

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsvg.git;a=commitdiff;h=7c3a1e0

The following commit has been merged in the master branch:
commit 7c3a1e06a405c78fe9c3fdb26b5ebdaca32ee0fc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 23 18:39:04 2014 +0400

    Run tests without Xvfb.
---
 debian/changelog | 4 ++++
 debian/control   | 2 --
 debian/rules     | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e774e02..5eb8dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtsvg-opensource-src (5.3.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Run tests again.
+  * Set QT_QPA_PLATFORM=minimal when running tests, so that they
+    can be run without Xvfb.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Aug 2014 18:34:12 +0400
 
diff --git a/debian/control b/debian/control
index 6384da4..37860f0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,6 @@ Build-Depends: dbus,
                pkg-kde-tools,
                qtbase5-dev (>= 5.3.1+dfsg-2~),
                qtbase5-private-dev (>= 5.3.1+dfsg-2~),
-               xauth,
-               xvfb,
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.3.1+dfsg-2~), qttools5-dev-tools (>= 5.3.1~)
 Standards-Version: 3.9.5
diff --git a/debian/rules b/debian/rules
index a5a6770..eb873d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,13 @@ export QT_SELECT := qt5
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtsvg5-dbg
 
 override_dh_auto_configure:
-	qmake #QT_BUILD_PARTS+=tests
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
-#override_dh_auto_test:
-#	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+override_dh_auto_test:
+	dh_auto_test -- QT_QPA_PLATFORM=minimal QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 
 override_dh_auto_install-arch:
 	dh_auto_install

-- 
qtsvg packaging