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

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 21:41:21 UTC 2014


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

The following commit has been merged in the master branch:
commit 38a40adfe68e5eb9a3f2116188cb40ff216279dd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 3 15:08:20 2014 +0400

    Build tests in build target, and use dh_auto_test.
    
    This does not yet fix the failure when cmake is installed.
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0aa84c9..2055fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtscript-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Provide qtscript-abi-5-2-0 (and not 5-1-0).
+  * Build tests in build target, and use dh_auto_test.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Dec 2013 13:59:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 361ed31..6d4a9d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export QT_QPA_PLATFORM := minimal
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	 dh_auto_build -Smakefile -- docs
@@ -38,4 +38,4 @@ prune-nonfree:
 	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
+	xvfb-run -a dh_auto_test

-- 
qtscript packaging



More information about the pkg-kde-commits mailing list