[SCM] qtlocation packaging branch, master, updated. debian/5.3.1-1-3-g7c71df4

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 7c71df43d7f2743d9323269966ae417b7bb686c6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Aug 26 21:34:30 2014 +0400

    Run tests with QT_QPA_PLATFORM=minimal, so that they could be run without Xvfb.
---
 debian/changelog | 2 ++
 debian/control   | 4 +---
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a3e6e2..4a5f8c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtlocation-opensource-src (5.3.1-2) UNRELEASED; urgency=medium
 
   * Drop dh_auto_build-arch override, no longer needed.
+  * Run tests with QT_QPA_PLATFORM=minimal, so that they could be
+    run without Xvfb.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Aug 2014 21:30:57 +0400
 
diff --git a/debian/control b/debian/control
index f7bcfce..da96450 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,7 @@ Build-Depends: dbus,
                libqt5opengl5-dev (>= 5.3.1+dfsg-2~),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.3.1+dfsg-2~),
-               qtdeclarative5-private-dev (>= 5.3.1~),
-               xauth,
-               xvfb
+               qtdeclarative5-private-dev (>= 5.3.1~)
 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 07e63bf..0de365b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ override_dh_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	xvfb-run -a dbus-launch --exit-with-session dh_auto_test -- QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	dbus-launch --exit-with-session dh_auto_test -- QT_QPA_PLATFORM=minimal QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins
 endif
 
 override_dh_auto_clean:

-- 
qtlocation packaging