[SCM] qtdeclarative packaging branch, master, updated. 33d7cb39d0e643fd507e7394d0b7913c9899154a

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 226526b9ab19e88bc938ad231f2178664b03a053
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Mar 21 06:32:26 2013 +0000

    Fix pkgconfig files, add comment on disabling the tests.
---
 debian/rules |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index e781b04..5d7b9e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,14 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 override_dh_auto_configure:
 	qmake
 
+override_dh_auto_install:
+	dh_auto_install
+	# Fix wrong path in pkgconfig files
+	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
+	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+# Requires X so disabled for now
 override_dh_auto_test:

-- 
qtdeclarative packaging