[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.4.2-2-6-gc87f5e0

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c87f5e09af68733aa4768154b9199611ec230689
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 27 14:59:01 2015 +0300

    Do not run QML tests, to avoid dependency on Xvfb.
---
 debian/changelog                       |  2 ++
 debian/patches/disable_qml_tests.patch | 14 ++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a70ae2f..39c010d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtwebsockets-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.5.0.
   * Run the tests on kfreebsd, just ignore the tests result.
   * Do not run tests during arch-indep build.
+  * Do not run QML tests, to avoid dependency on Xvfb
+    (disable_qml_tests.patch; patch taken from Ubuntu).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Aug 2015 14:28:20 +0300
 
diff --git a/debian/patches/disable_qml_tests.patch b/debian/patches/disable_qml_tests.patch
new file mode 100644
index 0000000..ec22463
--- /dev/null
+++ b/debian/patches/disable_qml_tests.patch
@@ -0,0 +1,14 @@
+Description: do not run QML tests, to avoid dependency on Xvfb
+Author: Timo Jyrinki <timo at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-08-27
+
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -2,6 +2,3 @@
+ 
+ SUBDIRS += cmake websockets
+ 
+-qtHaveModule(quick) {
+-    SUBDIRS += qml
+-}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..02c4e42
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_qml_tests.patch

-- 
qtwebsockets packaging