[SCM] qtscript packaging branch, master, updated. debian/5.2.0+dfsg-1-4-g38a40ad

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b50204f0c4c769c7242af0d50e66a02843f6c953
Author: I Ahmad <iftikhar.ahmad at canonical.com>
Date:   Thu Dec 19 12:54:23 2013 +0000

    Enable tests - other changes besides the patch
---
 debian/changelog      | 9 +++++++++
 debian/control        | 3 ++-
 debian/patches/series | 1 +
 debian/rules          | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a489722..19519b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qtscript-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Iftikhar Ahmad ]
+  * debian/patches/enable-make-check.patch:
+    - Fix make check to work.
+  * Run tests as part of the override_dh_auto_test
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Dec 2013 13:59:15 +0200
+
 qtscript-opensource-src (5.2.0+dfsg-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0f3d35c..b45bb88 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools (>= 0.15.8~),
-               qtbase5-private-dev (>= 5.2.0+dfsg~)
+               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.0-1~)
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
diff --git a/debian/patches/series b/debian/patches/series
index 426a245..021a4c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
diff --git a/debian/rules b/debian/rules
index d0f48a0..361ed31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg
@@ -35,3 +36,6 @@ override_dh_builddeb:
 prune-nonfree:
 	rm -rfv tests/benchmarks/script/sunspider/*
 	rm -rfv tests/benchmarks/script/v8/*
+
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run make -f Makefile check

-- 
qtscript packaging