[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.5.3-3-1-g2f8c911

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 2f8c91155f7061185c5bd01c53f41695d54d8778
Author: Fathi BOUDRA <fabo at debian.org>
Date:   Thu Oct 15 22:48:37 2009 +0200

    Add 08_configure_quilt_compat.diff patch. (Closes: #550127)
    quilt creates '.pc' directory. It breaks qmake projects search.
    Update debian/rules: re-add -fast configure option.
---
 debian/changelog                              |    8 ++++++++
 debian/patches/08_configure_quilt_compat.diff |   14 ++++++++++++++
 debian/patches/series                         |    1 +
 debian/rules                                  |    1 +
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8836fef..dbb8d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt4-x11 (4:4.5.3-4) unstable; urgency=low
+
+  * Add 08_configure_quilt_compat.diff patch. (Closes: #550127)
+    quilt creates '.pc' directory. It breaks qmake projects search.
+  * Update debian/rules: re-add -fast configure option.
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 15 Oct 2009 22:32:28 +0200
+
 qt4-x11 (4:4.5.3-3) unstable; urgency=low
 
   * Remove -fast configure option. Qt configure has -no-fast as default value
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
new file mode 100644
index 0000000..1c008d2
--- /dev/null
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -0,0 +1,14 @@
+Avoid '.pc' directories created by quilt.
+It breaks qmake projects search.
+
+--- a/configure
++++ b/configure
+@@ -7146,7 +7146,7 @@ fi
+ # .projects.3    -> the rest
+ rm -f .projects .projects.1 .projects.2 .projects.3
+ 
+-QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
++QMAKE_PROJECTS=`find "$relpath/." -name '.pc' -prune -o -name '*.pro' -print | sed 's-/\./-/-'`
+ if [ -z "$AWK" ]; then
+     for p in `echo $QMAKE_PROJECTS`; do
+         echo "$p" >> .projects
diff --git a/debian/patches/series b/debian/patches/series
index f2292e1..0f7f172 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,7 @@
 04_launch_uic-qt4.diff
 05_append_qt4_target.diff
 07_trust_dpkg-arch_over_uname-m.diff
+08_configure_quilt_compat.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
 11_build_translations.diff
diff --git a/debian/rules b/debian/rules
index e178acf..9d1c39c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,7 @@ endif
 	            -demosdir "/usr/lib/qt4/demos" \
 	            -examplesdir "/usr/lib/qt4/examples" \
 	            -opensource \
+	            -fast \
 	            -plugin-sql-mysql \
 	            -plugin-sql-odbc \
 	            -plugin-sql-psql \

-- 
Qt 4 Debian packaging