[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-14-g5f83b8b

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 5f83b8ba8d004b724879796e58961c62dc1352a4
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 20 10:47:10 2011 +0300

    * Update debian/rules:
      - drop ENABLE_GEOLOCATION as qt-mobility build dependency is removed.
      - add WTF_USE_GSTREAMER to enable GStreamer as the multimedia backend.
      - pass --sourcedirectory=Source to dh as the upstream tarball format has
        changed.
      - add override_dh_auto_clean to remove Source/Makefile file and avoid
        dh_clean failure.
---
 debian/changelog |    8 +++++++-
 debian/rules     |    8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6153091..63732d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,13 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
       will be used as the multimedia backend as recommended by upstream.
   * Update debian/*.install files for multiarch.
   * Add debian/README.source: explain how to create a new upstream tarball.
-
+  * Update debian/rules:
+    - drop ENABLE_GEOLOCATION as qt-mobility build dependency is removed.
+    - add WTF_USE_GSTREAMER to enable GStreamer as the multimedia backend.
+    - pass --sourcedirectory=Source to dh as the upstream tarball format has
+      changed.
+    - add override_dh_auto_clean to remove Source/Makefile file and avoid
+      dh_clean failure.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Sep 2011 16:32:18 +0300
 
diff --git a/debian/rules b/debian/rules
index f46b88a..c71fecb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,15 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	extra_configure_opts = DEFINES+=ENABLE_VIDEO=1 DEFINES+=ENABLE_GEOLOCATION=1
+	extra_configure_opts = DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
 endif
 
 %:
-	dh $@ --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
+	dh $@ --sourcedirectory=Source --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_configure_opts)
+
+override_dh_auto_clean:
+	rm -f Source/Makefile
+	dh_auto_clean

-- 
QtWebKit packaging