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

[Pino Toscano]

The following commit has been merged in the master branch:
commit 16853f800a76c44d9ee95f194fe11d30097cc61f
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 20:09:26 2011 +0200

    enable the video support for all the OSes, not just on Linux
---
 debian/changelog |    1 +
 debian/rules     |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c85659..bc694d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
+  * Enable the video support for all the OSes, not just on Linux.
 
   [ Fathi Boudra ]
   * Update debian/control:
diff --git a/debian/rules b/debian/rules
index e95a6e6..d28a1ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
     export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
 endif
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	extra_configure_opts = DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
-endif
-
 %:
 	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)
+	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
 #	TODO: qwebview configure/build/install
 
 override_dh_auto_clean:

-- 
QtWebKit packaging