[SCM] gammaray packaging branch, master, updated. debian/2.1.0-2-1-g5f8035a

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=5f8035a

The following commit has been merged in the master branch:
commit 5f8035a494ab9152adc3c316cd131e00e35b8ed9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jul 19 14:09:20 2014 +0200

    Force 24-bit color depth to Xvfb
    
    Attempts to fix "Unsupported screen depth: 8" failures during the test
    runs on some architectures.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 50c8e06..bbc5269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gammaray (2.1.0-3) UNRELEASED; urgency=medium
+
+  * Force 24-bit color depth to Xvfb
+    - attempts to fix "Unsupported screen depth: 8" failures during
+      the test runs on some architectures. 
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 19 Jul 2014 13:58:03 +0200
+
 gammaray (2.1.0-2) unstable; urgency=medium
 
   * Fix FTBFS on kFreeBSD, Hurd, mips, ppc, and s390x (Closes: #754986).
diff --git a/debian/rules b/debian/rules
index d13e341..b331fe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_build:
 	dh_auto_build -B obj-qt4 -O--parallel
 
 override_dh_auto_test:
-	xvfb-run dh_auto_test -B obj-qt5
+	xvfb-run -s "-screen 0 640x480x24" dh_auto_test -B obj-qt5
 
 override_dh_auto_install:
 	dh_auto_install -B obj-qt5

-- 
gammaray packaging