[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e70bd635a5a5394065128203fd03c95fa0c0fa3b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 13:36:13 2010 +0000

    [Qt] Library versioning.
    
    2.1 is branched, trunk will become 2.2.
    
    * Api/qwebkitglobal.h:
    * qt_webkit_version.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebkitglobal.h b/WebKit/qt/Api/qwebkitglobal.h
index d83d569..a6be571 100644
--- a/WebKit/qt/Api/qwebkitglobal.h
+++ b/WebKit/qt/Api/qwebkitglobal.h
@@ -22,9 +22,9 @@
 
 #include <QtCore/qglobal.h>
 
-#define QTWEBKIT_VERSION_STR "2.1.0"
+#define QTWEBKIT_VERSION_STR "2.2.0"
 // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt.
-#define QTWEBKIT_VERSION 0x020100
+#define QTWEBKIT_VERSION 0x020200
 // Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt.
 #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 654e544..e22ae1b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-22  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        [Qt] Library versioning.
+
+        2.1 is branched, trunk will become 2.2.
+
+        * Api/qwebkitglobal.h:
+        * qt_webkit_version.pri:
+
 2010-07-21  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebKit/qt/qt_webkit_version.pri b/WebKit/qt/qt_webkit_version.pri
index 1656f2d..9a78625 100644
--- a/WebKit/qt/qt_webkit_version.pri
+++ b/WebKit/qt/qt_webkit_version.pri
@@ -1,4 +1,4 @@
-QT_WEBKIT_VERSION = 4.8.0
+QT_WEBKIT_VERSION = 4.9.0
 QT_WEBKIT_MAJOR_VERSION = 4
-QT_WEBKIT_MINOR_VERSION = 8
+QT_WEBKIT_MINOR_VERSION = 9
 QT_WEBKIT_PATCH_VERSION = 0

-- 
WebKit Debian packaging