[SCM] qtlocation packaging branch, experimental, updated. debian/5.3.0-1-8-ga02cb62

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit a2190c4c9ddd7dfcc1047cc5977f41eb2d3f8d4b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 7 09:44:31 2014 -0300

    Keep tests disabled.
---
 debian/changelog |  2 +-
 debian/rules     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 646941c..e495999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qtlocation-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Re enable tests.
+  * Keep tests disabled. WE still can't find why one of them is failing.
   * Add build dependencies needed for running the tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 23:42:03 -0300
diff --git a/debian/rules b/debian/rules
index 7316fc1..9c35881 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export QT_SELECT := qt5
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtpositioning5-dbg
 
 override_dh_auto_configure:
-	qmake QT_BUILD_PARTS+=tests
+	qmake #QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-arch:
 	# This override may seem futile, but it helps us make sure that the tools
@@ -46,10 +46,10 @@ override_dh_auto_install-indep:
 override_dh_install:
 	dh_install --fail-missing
 
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	xvfb-run -a dbus-launch --exit-with-session dh_auto_test -- QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
-endif
+#override_dh_auto_test:
+#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+#	xvfb-run -a dbus-launch --exit-with-session dh_auto_test -- QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+#endif
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
qtlocation packaging