[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-8-10-g8a0bea8

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 8a0bea8fbf5f35f29087fd28697d0f0f65f26526
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon Sep 12 15:01:34 2011 +0300

    Fix build caused by multiarch paths
---
 debian/rules |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index ac7248b..405bbf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -244,7 +244,7 @@ override_dh_auto_install:
 	                          debian/tmp/usr/include/
 
 	# Fix wrong path in pkgconfig files
-	find $(CURDIR)/debian/tmp/usr/lib/pkgconfig -type f -name '*.pc' \
+	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
 	# Fix wrong path in prl files
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
@@ -276,10 +276,10 @@ override_dh_auto_install:
 	rm -f debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
 
 	# Remove phonon development files
-	rm -f debian/tmp/usr/lib/libphonon.la
-	rm -f debian/tmp/usr/lib/libphonon.prl
-	rm -f debian/tmp/usr/lib/libphonon.so
-	rm -f debian/tmp/usr/lib/pkgconfig/phonon.pc
+	rm -f debian/tmp/usr/lib/*/libphonon.la
+	rm -f debian/tmp/usr/lib/*/libphonon.prl
+	rm -f debian/tmp/usr/lib/*/libphonon.so
+	rm -f debian/tmp/usr/lib/*/pkgconfig/phonon.pc
 	rm -rf debian/tmp/usr/include/qt4/phonon
 
 	# Remove leftover directories

-- 
Qt 4 packaging