[SCM] qbs packaging branch, master, updated. debian/1.4.3+dfsg-1-2-g0e490bd

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0e490bdc7558fce71ae3dd782636c3de212e6646
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 29 14:39:46 2015 +0300

    Do not try to run tests during arch-indep builds.
---
 debian/changelog | 1 +
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 953d9c1..c998eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 qbs (1.4.3+dfsg-2) UNRELEASED; urgency=medium
 
+  * Do not try to run tests during arch-indep builds.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 29 Oct 2015 11:22:24 +0300
 
diff --git a/debian/rules b/debian/rules
index f1f2001..d9ec75c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ override_dh_auto_install-indep:
 	rmdir $(CURDIR)/debian/tmp/usr/share/doc/qbs/html/images/used-in-examples/
 	rmdir $(CURDIR)/debian/tmp/usr/share/doc/qbs/html/scripts/
 
-override_dh_auto_test:
+override_dh_auto_test-arch:
 	mkdir -p $(CONFIG_DIR)/QtProject
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
@@ -53,5 +53,7 @@ override_dh_auto_test:
 			$(CURDIR)/bin/qbs-config profiles.qbs_autotests.baseProfile gcc; \
 		dh_auto_test
 
+override_dh_auto_test-indep:
+
 override_dh_install:
 	dh_install --fail-missing

-- 
qbs packaging