[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.5.3-2-2-g2cf93a9

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 2cf93a9e2373e4d1e3b16e5da9fc6ea84bc3fdf8
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Oct 9 16:15:31 2009 +0200

    * Remove -fast configure option. Qt configure has -no-fast as default value
      and will generate Makefiles for all project files, including bootstrap.
      (Closes: #550127)
    * Reorganize configure option as they appear in configure --help.
---
 debian/changelog |    4 +++-
 debian/rules     |   32 +++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e42a61c..1372f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qt4-x11 (4:4.5.3-3) UNRELEASED; urgency=low
 
-  * qrap, it's still not fixed (Closes: #550127)
+  * Remove -fast configure option. Qt configure has -no-fast as default value
+    and will generate Makefiles for all project files, including bootstrap.
+    (Closes: #550127)
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 09 Oct 2009 13:53:57 +0200
 
diff --git a/debian/rules b/debian/rules
index b03c88b..2e218ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,34 +116,32 @@ endif
 	            -sysconfdir "/etc/xdg" \
 	            -demosdir "/usr/lib/qt4/demos" \
 	            -examplesdir "/usr/lib/qt4/examples" \
-	            -platform $(PLATFORM_ARG) \
 	            -opensource \
-	            -fast \
-	            -optimized-qmake \
-	            -no-rpath \
-	            -system-zlib \
-	            -system-libtiff \
-	            -system-libpng \
-	            -system-libjpeg \
-	            -system-nas-sound \
-	            -qt-gif \
 	            -plugin-sql-mysql \
 	            -plugin-sql-odbc \
 	            -plugin-sql-psql \
 	            -plugin-sql-sqlite \
 	            -plugin-sql-sqlite2 \
 	            -system-sqlite \
-	            -I/usr/include/freetype2 \
-	            -lfontconfig \
-	            -cups \
-	            -exceptions \
-	            -dbus \
-	            -pch \
+	            -xmlpatterns \
 	            -phonon \
 	            -no-phonon-backend \
 	            -svg \
 	            -webkit \
-	            -xmlpatterns \
+	            -scripttools \
+	            -platform $(PLATFORM_ARG) \
+	            -system-zlib \
+	            -qt-gif \
+	            -system-libtiff \
+	            -system-libpng \
+	            -system-libjpeg \
+	            -no-rpath \
+	            -optimized-qmake \
+	            -dbus \
+	            -gtkstyle \
+	            -system-nas-sound \
+	            -lfontconfig \
+	            -I/usr/include/freetype2 \
 	            $(EXTRA_CONFIGURE_OPTS)
 
 clean::

-- 
Qt 4 Debian packaging