[SCM] WebKit Debian packaging branch, debian, updated. 0+svn25144-1-4-g5ad7f2c

[Mike Hommey]

The branch, debian has been updated
       via  5ad7f2c86cde32db708f8f0d4bfaafd379f03efe (commit)
      from  5b1601dfdfafb08bd3e7ba9c5c5cfc079744a06d (commit)


- Shortlog ------------------------------------------------------------
5ad7f2c Fix build failure with qt3-dev-tools installed

Summary of changes:
 debian/changelog |    5 ++++-
 debian/rules     |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5ad7f2c86cde32db708f8f0d4bfaafd379f03efe
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Sep 6 07:32:13 2007 +0200

    Fix build failure with qt3-dev-tools installed
      * debian/rules: Explicitely use qmake-qt4 instead of qmake to avoid build
        failures when qt3-dev-tools is installed. Thanks Michael Biebl.
        Closes: #441007.

diff --git a/debian/changelog b/debian/changelog
index 47bddd1..e261482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ webkit (0~svn25144-2) UNRELEASED; urgency=low
     these new defines. Thanks Riku Voipio.
   * debian/control: Build depend on Qt >= 4.3. Thanks Hubert Figuiere.
     Closes: #439672.
+  * debian/rules: Explicitely use qmake-qt4 instead of qmake to avoid build
+    failures when qt3-dev-tools is installed. Thanks Michael Biebl.
+    Closes: #441007.
 
- -- Mike Hommey <glandium at debian.org>  Mon, 27 Aug 2007 20:58:36 +0200
+ -- Mike Hommey <glandium at debian.org>  Thu, 06 Sep 2007 07:28:41 +0200
 
 webkit (0~svn25144-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 43566e8..75f88ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+QMAKE=qmake-qt4
 SO_VERSION=0d
 
 clean-gdk:
@@ -32,7 +33,7 @@ build-gdk-stamp:
 
 	[ ! -d build-gdk ] && mkdir build-gdk || true
 	cd build-gdk && \
-	qmake -r \
+	$(QMAKE) -r \
 		OUTPUT_DIR="$(CURDIR)"/build-gdk \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
@@ -56,7 +57,7 @@ build-qt-stamp:
 
 	[ ! -d build-qt ] && mkdir build-qt || true
 	cd build-qt && \
-	qmake -r \
+	$(QMAKE) -r \
 		OUTPUT_DIR="$(CURDIR)"/build-qt \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \

-- 
WebKit Debian packaging