[SCM] qt5webkit packaging branch, master, updated. 7e3fc0e809cbec5d484a0daee9a75a6e20df36f3

Pino Toscano pino at alioth.debian.org
Sun May 19 13:19:16 UTC 2013


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

The following commit has been merged in the master branch:
commit d8cc7e9164fb19b47710e6d68ab81ea75345cace
Author: Pino Toscano <pino at debian.org>
Date:   Sun May 19 15:18:46 2013 +0200

    use $(DEB_HOST_MULTIARCH)
---
 debian/rules |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8256c08..54db003 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,11 +31,11 @@ override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
 	
 	# Remove rpath from the offending binaries
-	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebProcess
-	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebPluginProcess
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/libexec/QtWebProcess
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/libexec/QtWebPluginProcess
 	
 	# Fix wrong path in pkgconfig files
-	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 	
 	# Remove private headers

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list