[SCM] qbs packaging branch, master, updated. debian/1.4.1+dfsg-7-2-g97f4e41
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Aug 7 18:34:05 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=97f4e41
The following commit has been merged in the master branch:
commit 97f4e417573dbd19f55b865da2d69a57380564cc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Aug 7 21:33:47 2015 +0300
Tell qmake where to install libraries and plugins.
---
debian/changelog | 3 +++
debian/rules | 12 +++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8fa750..524c919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qbs (1.4.1+dfsg-8) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Tell qmake where to install libraries and plugins, rather than moving
+ them after installing (LP: #1456593).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Aug 2015 21:30:06 +0300
diff --git a/debian/rules b/debian/rules
index ce64d53..b1ead15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,9 @@ override_dh_auto_configure:
QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
QMAKE_LFLAGS+="${LDFLAGS}" \
- QBS_INSTALL_PREFIX=/usr
+ QBS_INSTALL_PREFIX=/usr \
+ QBS_LIB_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH} \
+ QBS_PLUGINS_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qbs/plugins
override_dh_auto_build-indep:
dh_auto_build -- docs
@@ -40,14 +42,6 @@ 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_install-arch:
- dh_auto_install
-
- # Move libraries to Multi-Arch locations
- mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
- mv $(CURDIR)/debian/tmp/usr/lib/*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- mv $(CURDIR)/debian/tmp/usr/lib/qbs $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-
override_dh_auto_test:
mkdir -p $(CONFIG_DIR)/QtProject
set -ex; \
--
qbs packaging
More information about the pkg-kde-commits
mailing list