[SCM] qtfeedback packaging branch, master, updated. 95cbd1016d603e3c867c15ceffca29b8faf32830

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit ac04e1300c1bde157acfc47bc2add73bf5765e7b
Author: Timo Jyrinki <timo.jyrinki at iki.fi>
Date:   Tue Feb 11 07:49:29 2014 +0200

    Enable tests
---
 debian/control | 4 +++-
 debian/rules   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 5c6a6e5..3a42ab3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Build-Depends: debhelper (>= 9),
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
-               qtmultimedia5-dev
+               qtmultimedia5-dev,
+               xauth,
+               xvfb,
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtfeedback.git
diff --git a/debian/rules b/debian/rules
index 3d2a9cb..9c7bfcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,11 @@ override_dh_auto_install:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 	
+override_dh_auto_test:
+	# Copy missing qmldir file to have tests running successfully
+	cp -a src/imports/feedback/qmldir qml/QtFeedback/
+	cd tests ; qmake ; xvfb-run -a make check QML2_IMPORT_PATH=../../../qml QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 

-- 
qtfeedback packaging