[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.2-1-10-g9ad64ea

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 9ad64eae48902b3348ec6477fd4997465e53330a
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 11:48:58 2011 +0200

    remove pkgconfig fix - pkgconfig files aren't shipped undet Linux
    fix executable permissions files
    fix typo libs -> lib
---
 debian/changelog |    3 +++
 debian/rules     |   14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 560ac15..4aebeff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ qtmobility (1.2.0~beta0+git3174-1) unstable; urgency=low
   * Update debian/rules:
     - add connectivity to the list of modules.
     - add -languages configure option.
+    - remove pkgconfig fix - pkgconfig files aren't shipped undet Linux.
+    - fix executable permissions files.
+    - fix typo libs -> lib.
   * Update debian/*.install files.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 06 Mar 2011 14:15:40 +0200
diff --git a/debian/rules b/debian/rules
index f47d4bd..f64056f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,12 +26,16 @@ override_dh_auto_configure:
 
 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 perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
-	# Fix wrong path in prl files
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
+	# Fix executable permissions
+	find $(CURDIR)/debian/tmp/usr/lib/qtmobility -type f -perm /u+x,g+x,o+x \( -false \
+		-o -name \*.png \
+		-o -name \*.qml \
+		-o -name \*.sci \
+		-o -name \*.txt \
+		-o -name qmldir \
+		\) | xargs chmod -x
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -46,4 +50,4 @@ override_dh_auto_clean:
 	    -o -type f -name config.\* \
 	    -o -type f -name mobility\*.prf \
 	\) -delete
-	rm -rf include libs
+	rm -rf include lib

-- 
Qt Mobility packaging