[SCM] qtlocation packaging branch, location-packages, updated. debian/5.2.1-1-6-g595e03b

[Dmitry Shachnev]

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

The following commit has been merged in the location-packages branch:
commit 595e03b5eec4741f53a1eb3de79c9295a1d20566
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 24 14:58:31 2014 +0400

    Pass ‘-screen 0 640x480x24’ to Xvfb server when running tests.
    
    According to Timo, this is needed for executing OpenGL/QML tests
    on the builders.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 174912a..20016a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtlocation-opensource-src (5.2.1-2) UNRELEASED; urgency=medium
   * Rename the -doc, -dbg and -examples packages to match the source
     package name, for consistency with other Qt 5 modules.
   * Build new packages for qtlocation module.
+  * Pass ‘-screen 0 640x480x24’ to Xvfb server when running tests,
+    needed for executing OpenGL/QML tests on the builders.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Mar 2014 13:37:08 +0400
 
diff --git a/debian/rules b/debian/rules
index 3d4567b..d1ba800 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ override_dh_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	xvfb-run -a -s '-screen 0 640x480x24' dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 endif
 
 override_dh_auto_clean:

-- 
qtlocation packaging