[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.2.0-3-5-g63a4329
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Feb 10 02:18:55 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=a4f34cb
The following commit has been merged in the experimental branch:
commit a4f34cb0497165497f0cba7e6a4eed6f53615b8b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sun Feb 9 23:10:31 2014 -0300
Refresh and fix disable_network_tests.patch.
---
debian/changelog | 1 +
debian/patches/disable_network_tests.patch | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bffb658..5b21ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtxmlpatterns-opensource-src (5.2.1-1) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* New upstream release.
+ * Refresh and fix disable_network_tests.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 09 Feb 2014 22:34:32 -0300
diff --git a/debian/patches/disable_network_tests.patch b/debian/patches/disable_network_tests.patch
index 4ae7242..030d37a 100644
--- a/debian/patches/disable_network_tests.patch
+++ b/debian/patches/disable_network_tests.patch
@@ -1,33 +1,29 @@
Description: disable tests that require network connection
Author: Iftikhar Ahmad <iftikhar.ahmad at canonical.com>
Forwarded: not-needed
-Last-Update: 2013-01-03
+Last-Update: 2014-02-10
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
-@@ -19,12 +19,10 @@ SUBDIRS=\
+@@ -19,10 +19,8 @@ SUBDIRS=\
qxmlname \
qxmlnamepool \
qxmlnodemodelindex \
- qxmlquery \
qxmlresultitems \
- qxmlschema \
- qxmlschemavalidator \
qxmlserializer \
- xmlpatterns \
xmlpatternsdiagnosticsts \
- xmlpatternsschema \
- xmlpatternsschemats \
-@@ -32,7 +30,11 @@ SUBDIRS=\
+ xmlpatternssdk \
xmlpatternsvalidator \
- xmlpatternsview \
+@@ -30,6 +28,10 @@ SUBDIRS=\
xmlpatternsxqts \
-- xmlpatternsxslts \
-+ xmlpatternsxslts
-+
+ xmlpatternsxslts \
+
+#skip the network tests for unix platform.
+!unix:SUBDIRS += qxmlquery
+!unix:SUBDIRS += xmlpatterns
-
- xmlpatternsdiagnosticsts.depends = xmlpatternssdk
- xmlpatternsview.depends = xmlpatternssdk
++
+ load(qfeatures)
+ !contains(QT_DISABLED_FEATURES, xmlschema) {
+ SUBDIRS += qxmlschema \
--
qtxmlpatterns packaging
More information about the pkg-kde-commits
mailing list