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

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 550b1c1c1d4f4d7184cf7cbda9137e0b5fbc5ffb
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 12:06:10 2011 +0200

    Switch to Qt MultimediaKit for the video support (instead of Phonon), build
    depends on QtMultimediaKit.
    Enable geolocation support: build depends on QtLocation and define
    ENABLE_GEOLOCATION.
---
 debian/changelog |    4 ++++
 debian/control   |    7 +++----
 debian/rules     |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be68597..97712c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtwebkit (2.1.0~2011week09-1) unstable; urgency=low
   * New upstream release - upload to Sid.
   * Add webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch to
     work around the build failure.
+  * Switch to Qt MultimediaKit for the video support (instead of Phonon), build
+    depends on QtMultimediaKit.
+  * Enable geolocation support: build depends on QtLocation and define
+    ENABLE_GEOLOCATION.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 06 Mar 2011 10:05:46 +0200
 
diff --git a/debian/control b/debian/control
index 4b5683f..db116ed 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Priority: optional
 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~beta2), libqt4-opengl-dev (>= 4:4.7.0~beta2),
- libphonon-dev (>= 4:4.6.0), libicu-dev, libsqlite3-dev,
- libxext-dev, libxrender-dev, gperf
+ libqt4-dev (>= 4:4.7.0), libqt4-opengl-dev (>= 4:4.7.0),
+ libicu-dev, libsqlite3-dev, libxext-dev, libxrender-dev, gperf, qtmobility-dev
 Standards-Version: 3.9.1
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
@@ -16,7 +15,7 @@ Package: libqtwebkit-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libqtwebkit4 (= ${binary:Version}),
- libqt4-dev (>= 4:4.7.0~beta2)
+ libqt4-dev (>= 4:4.7.0)
 Replaces: libqt4-dev (<= 4:4.7.0~beta1)
 Description: Web content engine library for Qt - development files
  QtWebKit provides a Web browser engine that makes it easy to embed content
diff --git a/debian/rules b/debian/rules
index 54e3f88..a0f2846 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@
 	dh $@ --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- DEFINES+=ENABLE_VIDEO
+	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=ENABLE_GEOLOCATION=1

-- 
QtWebKit packaging