[SCM] qtdeclarative packaging branch, master, updated. debian/5.0.2-1-8-g9eefb7a

Pino Toscano pino at alioth.debian.org
Tue Apr 30 17:45:21 UTC 2013


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

The following commit has been merged in the master branch:
commit 9eefb7ac30ef9c6041554a133283e47a01cdd2f7
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 30 19:45:11 2013 +0200

    rules: use $(DEB_HOST_MULTIARCH) everywhere
---
 debian/changelog |    1 +
 debian/rules     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7d2bc4..22c9c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtdeclarative-opensource-src (5.0.2-2) UNRELEASED; urgency=low
   * Remove extra ${shlibs:Depends} from qtdeclarative5-private-dev.
   * Bump the libqt5v8-5-private-dev and libqt5xmlpatterns5-private-dev build
     dependencies to 5.0.2~.
+  * rules: use $(DEB_HOST_MULTIARCH) everywhere.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 22 Apr 2013 13:51:55 -0300
 
diff --git a/debian/rules b/debian/rules
index 5ada4a8..96c6be1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,11 @@ override_dh_auto_install:
 	dh_auto_install
 
 	# 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' {} \;
 
 	# Fix wrong permissions in examples.
-	find $(CURDIR)/debian/tmp/usr/lib/*/qt5/examples/ -type f \( \
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
 	-name '*.png' \
 	-o -name '*.php' \
 	-o -name '*.xsl' \

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list