[SCM] qtxmlpatterns packaging branch, master, updated. debian/5.2.0-2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit eb9009ce4f2e20ac5154c16e0f6be349a29f6f5f
Author: I Ahmad <iftikhar.ahmad at canonical.com>
Date:   Wed Dec 18 10:01:24 2013 +0000

    Enabled the make check and conditionally disabled the network dependent test cases.
    
      * Enable make check.
      * Conditionally skip the network dependent unit tests.
---
 debian/changelog                       |  4 ++++
 debian/control                         |  3 ++-
 debian/patches/enable-make-check.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  5 +++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9ffa9cc..c8a8510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtxmlpatterns-opensource-src (5.2.0-2) UNRELEASED; urgency=low
   [ Timo Jyrinki ]
   * Don't depend on "+dfsg" qttools
 
+  [ Iftikhar Ahmad ]
+  * Enable make check.
+  * Conditionally skip the network dependent unit tests. 
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 Dec 2013 23:40:02 -0300
 
 qtxmlpatterns-opensource-src (5.2.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index ddd3f5b..317768f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools,
-               qtbase5-private-dev (>= 5.2.0+dfsg~)
+               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite,
                qttools5-dev-tools (>= 5.2.0~)
 Standards-Version: 3.9.4
diff --git a/debian/patches/enable-make-check.patch b/debian/patches/enable-make-check.patch
new file mode 100644
index 0000000..751cf7a
--- /dev/null
+++ b/debian/patches/enable-make-check.patch
@@ -0,0 +1,28 @@
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -19,12 +19,10 @@ SUBDIRS=\
+            qxmlname                     \
+            qxmlnamepool                 \
+            qxmlnodemodelindex           \
+-           qxmlquery                    \
+            qxmlresultitems              \
+            qxmlschema                   \
+            qxmlschemavalidator          \
+            qxmlserializer               \
+-           xmlpatterns                  \
+            xmlpatternsdiagnosticsts     \
+            xmlpatternsschema            \
+            xmlpatternsschemats          \
+@@ -32,7 +30,11 @@ SUBDIRS=\
+            xmlpatternsvalidator         \
+            xmlpatternsview              \
+            xmlpatternsxqts              \
+-           xmlpatternsxslts             \
++           xmlpatternsxslts
++
++#skip the network tests for unix platform.
++!unix:SUBDIRS += qxmlquery
++!unix:SUBDIRS += xmlpatterns
+ 
+ xmlpatternsdiagnosticsts.depends = xmlpatternssdk
+ xmlpatternsview.depends = xmlpatternssdk
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..351c748
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+enable-make-check.patch
diff --git a/debian/rules b/debian/rules
index 297253b..9c5487a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg
@@ -37,3 +38,7 @@ override_dh_install:
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+

-- 
qtxmlpatterns packaging