[SCM] qbs packaging branch, master, updated. debian/1.5.2+dfsg-1-4-gaee7347

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit ce4a8c998f94e2626d6291ba89e7aa6f8c17a2e2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 3 14:50:16 2016 +0300

    Set $HOME to a temporary location when running tests.
---
 debian/changelog | 1 +
 debian/rules     | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35fe44b..da6a301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.6.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Set $HOME to a temporary location when running tests.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 03 Sep 2016 14:43:46 +0300
 
diff --git a/debian/rules b/debian/rules
index 9857f62..66273e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CONFIG_DIR = $(CURDIR)/debian/config
+TMP_HOME_DIR = $(CURDIR)/debian/home
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -16,7 +16,7 @@ export QT_SELECT := qt5
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rfv doc/html $(CONFIG_DIR) tests/auto/*/testWorkDir lib
+	rm -rfv doc/html $(TMP_HOME_DIR) tests/auto/*/testWorkDir lib
 	rm -fv doc/qbs.qch bin/qbs* bin/tst*
 	find . -type f -name .gitignore -delete -print
 
@@ -40,10 +40,9 @@ override_dh_auto_install-indep:
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
 
 override_dh_auto_test-arch:
-	mkdir -p $(CONFIG_DIR)/QtProject
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
-		export XDG_CONFIG_HOME=$(CONFIG_DIR); \
+		export HOME=$(TMP_HOME_DIR); \
 		$(CURDIR)/bin/qbs-setup-toolchains --detect; \
 		$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \
 		[ -n "`$(CURDIR)/bin/qbs-config --list profiles.qbs_autotests.baseProfile`" ] || \

-- 
qbs packaging