[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week03-1-5-g1d7d9a2

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 1d7d9a21255e350b74dc7464886df8ae5a87564b
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 12:54:50 2011 +0200

    Enable Qt Mobility only on Linux
---
 debian/control |    3 ++-
 debian/rules   |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index db116ed..5356f78 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.4.15), pkg-kde-tools (>= 0.6.4),
  libqt4-dev (>= 4:4.7.0), libqt4-opengl-dev (>= 4:4.7.0),
- libicu-dev, libsqlite3-dev, libxext-dev, libxrender-dev, gperf, qtmobility-dev
+ libicu-dev, libsqlite3-dev, libxext-dev, libxrender-dev, gperf,
+ qtmobility-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
diff --git a/debian/rules b/debian/rules
index a0f2846..11ce61d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	extra_configure_opts = DEFINES+=ENABLE_GEOLOCATION=1
+endif
+
 %:
 	dh $@ --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=ENABLE_GEOLOCATION=1
+	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 $(extra_configure_opts)

-- 
QtWebKit packaging