[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit a93de0baafa0ee83178f1c426cee835964c4127d
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 18:35:17 2011 +0200

    Update paths in debian/rules due to multiarch changes.
---
 debian/rules |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6779ad5..dc22364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -252,7 +252,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' \
@@ -284,10 +284,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