[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week09-3-5-ge35424c

[Fathi Boudra]

The following commit has been merged in the master branch:
commit e35424c463734e21b612a4f1daa1142a7b3dfd67
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Apr 7 08:52:30 2011 +0300

    Drop webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch.
---
 debian/changelog                                   |    3 +-
 debian/patches/series                              |    1 -
 ...plugin_createfullscreenvideohandler_ftbfs.patch |   22 --------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c53bb0b..9c0f78a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtwebkit (2.1.0~2011week13-1) UNRELEASED; urgency=low
+qtwebkit (2.1.0~2011week13-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -8,6 +8,7 @@ qtwebkit (2.1.0~2011week13-1) UNRELEASED; urgency=low
 
   [ Fathi Boudra ]
   * Ship libqtwebkit-qmlwebkitplugin package. (Closes: #601650)
+  * Drop webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Apr 2011 11:37:59 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index ece8a1a..edef33c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,4 @@
 stabs_format_debug_info.diff
 no_gc_sections.diff
 09_hurd.diff
-webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
 linux_amd64_no_overcommit.diff
diff --git a/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch b/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
deleted file mode 100644
index 158e015..0000000
--- a/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: ftbfs work around WebCore::QtPlatformPlugin has no member named
-             createFullScreenVideoHandler
-Author: Fathi Boudra <fabo at debian.org>
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
-@@ -2572,13 +2572,11 @@ contains(DEFINES, ENABLE_VIDEO=1) {
-         bindings/js/JSAudioConstructor.cpp
- 
-         !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) {
--            HEADERS += \ 
--                platform/graphics/qt/MediaPlayerPrivateQt.h \
--                $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
-+            HEADERS += \
-+                platform/graphics/qt/MediaPlayerPrivateQt.h
- 
-             SOURCES += \
--                platform/graphics/qt/MediaPlayerPrivateQt.cpp \
--                $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
-+                platform/graphics/qt/MediaPlayerPrivateQt.cpp
- 
-             CONFIG *= mobility
-             MOBILITY += multimedia

-- 
QtWebKit packaging