[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-14-g44e3b37

[Pino Toscano]

The following commit has been merged in the master branch:
commit b9d7580cff2cabeacd8e73e7391bc8e4ec94f2d5
Author: Pino Toscano <pino at kde.org>
Date:   Tue Jan 4 12:08:25 2011 +0100

    merge the changelog stanzas for 2.0~week32-2 and 2.1~week35-1
    
    both are UNRELEASED
---
 debian/changelog |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e387a8..c470897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,19 @@
 qtwebkit (2.1~week35-1) UNRELEASED; urgency=low
 
   * New upstream release: switch to Qt WebKit 2.1 branch.
-  * Remove 0002_add_webkit_qt_config.patch - merged upstream.
-  * Update libqtwebkit-dev.install file: add qwebkitplatformplugin.h.
-
- -- Fathi Boudra <fabo at debian.org>  Sun, 05 Sep 2010 09:08:05 +0300
-
-qtwebkit (2.0~week32-2) UNRELEASED; urgency=low
-
-  * New upstream release.
 
   [ Fathi Boudra ]
-  * Add 0002_add_webkit_qt_config.patch to include webkit in QT_CONFIG.
   * Update debian/control:
     - build depends on Qt 4.7.0 beta 2.
     - add libqtwebkit-qmlwebkitplugin package.
   * Update debian/rules:
     - pass DEFINES+=ENABLE_VIDEO to build with audio/video support.
+  * Update libqtwebkit-dev.install file: add qwebkitplatformplugin.h.
 
   [ Modestas Vainius ]
   * Fix debian/control Vcs fields to point to the new location.
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 13 Jul 2010 13:24:07 +0300
+ -- Fathi Boudra <fabo at debian.org>  Sun, 05 Sep 2010 09:08:05 +0300
 
 qtwebkit (2.0~week26-2) experimental; urgency=low
 

-- 
QtWebKit packaging