[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.2 branch:
commit 0fe559a6b4eda39776ea022919757a63a77f5f5a
Author: Gustavo Noronha Silva <gns at gnome.org>
Date:   Fri Apr 2 10:15:14 2010 -0300

    Update versioning, and NEWS for 1.2.0.

diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS
index 45e3121..42f57c6 100644
--- a/WebKit/gtk/NEWS
+++ b/WebKit/gtk/NEWS
@@ -1,3 +1,17 @@
+================
+WebKitGTK+ 1.2.0
+================
+
+What's new in WebKitGTK+ 1.2.0?
+
+  - New stable branch of WebKitGTK+; API and ABI stable.
+  - A number of crashes discovered since the 1.1.90 release
+    have been fixed.
+  - Building for SPARC has been fixed.
+  - Building on Itanium in 32 bits mode is now possible.
+  - Building with newer versions of GTK+ is fixed.
+  - A few translations got updated.
+
 =================
 WebKitGTK+ 1.1.90
 =================
diff --git a/configure.ac b/configure.ac
index 5bc1781..0536ff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
-m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [90])
+m4_define([webkit_minor_version], [2])
+m4_define([webkit_micro_version], [0])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=19:1:17
+LIBWEBKITGTK_VERSION=19:2:17
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])

-- 
WebKit Debian packaging