[SCM] qtlocation packaging branch, master, updated. debian/5.3.0-1-9-g0b42fdc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 6199bb2772ba9f694bfc0840981c105d00188ecb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 29 23:43:12 2014 -0300

    Re enable tests.
---
 debian/changelog |  3 +++
 debian/rules     | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c74683b..e2dbdc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtlocation-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Re enable tests.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 23:42:03 -0300
 
 qtlocation-opensource-src (5.3.0-1) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index e6c08bc..d3b4f91 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 dh_auto_test -- 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 dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
qtlocation packaging