[SCM] qtwebsockets packaging branch, master, updated. debian/5.3.2-4-5-g3436d29

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1864e405f6f281099f2458397a97b3435a1e54fa
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 24 00:30:57 2014 -0300

    Simplify the patch.
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6c2579f..3c93296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-disable_test_architecures := kfreebsd-i386 kfreebsd-amd64
-
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtwebsockets5-dbg
 
@@ -42,9 +40,9 @@ override_dh_auto_install-arch:
 
 # Disable tests on kfreebsd-*, they are not right.
 # See https://bugreports.qt-project.org/browse/QTBUG-41448
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disable_test_architecures)))
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 override_dh_auto_test:
-	echo "Tests disabled on $(disable_test_architecures), \
+	echo "Tests disabled on kfreebsd, \
 	see https://bugreports.qt-project.org/browse/QTBUG-41448"
 endif
 

-- 
qtwebsockets packaging