[SCM] qt3d packaging branch, master, updated. 49ad6659a167c06971d25ae5248e98fc266b2aa6

Timo Jyrinki timo at moszumanska.debian.org
Tue Feb 11 05:45:23 UTC 2014


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

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

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

diff --git a/debian/control b/debian/control
index 8fa4ce3..6c04c89 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends: debhelper (>= 9.0.0),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.2.0+dfsg~),
                qtdeclarative5-private-dev (>= 5.2.0~),
+               xauth,
+               xvfb,
                zlib1g-dev,
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
diff --git a/debian/rules b/debian/rules
index 285f263..1ee044a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 override_dh_auto_configure:
 	mkdir .git
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
 	dh_auto_install
@@ -28,6 +28,9 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 

-- 
qt3d packaging



More information about the pkg-kde-commits mailing list