[SCM] qbs packaging branch, master, updated. debian/1.4.2+dfsg-2-2-g239780b

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 239780bdd53ad37d73e6416d65461a9fb1184b9c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 5 10:18:20 2015 +0300

    Use QBS_LIBRARY_DIRNAME to specify library dir.
---
 debian/changelog | 2 ++
 debian/rules     | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cb9fb7..a428847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.4.2+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Use QBS_LIBRARY_DIRNAME to specify library dir (closes: #797774).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Sep 2015 20:17:18 +0300
 
diff --git a/debian/rules b/debian/rules
index 64805c2..f1f2001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,7 @@ override_dh_auto_configure:
 		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
 		QMAKE_LFLAGS+="${LDFLAGS}" \
 		QBS_INSTALL_PREFIX=/usr \
-		QBS_LIB_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH} \
-		QBS_PLUGINS_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH}
+		QBS_LIBRARY_DIRNAME=lib/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
@@ -46,7 +45,7 @@ override_dh_auto_install-indep:
 override_dh_auto_test:
 	mkdir -p $(CONFIG_DIR)/QtProject
 	set -ex; \
-		export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
+		export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
 		export XDG_CONFIG_HOME=$(CONFIG_DIR); \
 		$(CURDIR)/bin/qbs-setup-toolchains --detect; \
 		$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \

-- 
qbs packaging