[SCM] qtimageformats packaging branch, master, updated. debian/5.6.1-1

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Jun 13 12:22:37 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtimageformats.git;a=commitdiff;h=4b0dbb3

The following commit has been merged in the master branch:
commit 4b0dbb334622d6eef6e4a59f5bdfdecc0bc5d39d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 2 20:40:08 2016 +0300

    Run the tests outside Xvfb and stop ignoring the failures.
---
 debian/changelog | 3 +++
 debian/control   | 4 +---
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c99b508..e8d89a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ qtimageformats-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
     before uploading 5.6.0 final).
   * Remove build-dependency on qtbase5-private-dev. The private qtbase headers
     are not used, so depending on qtbase5-dev is enough.
+  * Run the tests without Xvfb, just set QT_QPA_PLATFORM=minimal.
+  * Stop ignoring the tests failures (a bug in qtbase which prevented them from
+    succeeding has been fixed in the last upload).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 Dec 2015 16:30:34 -0800
 
diff --git a/debian/control b/debian/control
index 987dbe5..92a1fac 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,7 @@ Build-Depends: debhelper (>= 9),
                libtiff-dev,
                libwebp-dev (>= 0.4.0-4.1~),
                pkg-kde-tools,
-               qtbase5-dev (>= 5.6.0~beta+dfsg~),
-               xauth,
-               xvfb
+               qtbase5-dev (>= 5.6.0~beta+dfsg-3~)
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtimageformats.git
diff --git a/debian/rules b/debian/rules
index 8741deb..160d94a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,4 +21,4 @@ override_dh_auto_install:
 	rm -rfv $(CURDIR)/debian/qt5-image-formats-plugins/usr/lib/*/cmake/
 
 override_dh_auto_test:
-	-xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins
+	QT_QPA_PLATFORM=minimal dh_auto_test

-- 
qtimageformats packaging



More information about the pkg-kde-commits mailing list