[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-25-gb2c19be

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 9d07fda89aab7105962d933eef32ca15dda610d8
Author: Gustavo Noronha Silva <gns at gnome.org>
Date:   Fri Sep 3 16:30:14 2010 -0300

    News and versioning for the 1.2.4 release.

diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS
index 9af13e0..ff703f4 100644
--- a/WebKit/gtk/NEWS
+++ b/WebKit/gtk/NEWS
@@ -1,4 +1,19 @@
 ================
+WebKitGTK+ 1.2.4
+================
+
+What's new in WebKitGTK+ 1.2.4?
+
+  - New stable release, API and ABI compatible with previous 1.2.x
+    versions;
+  - The patches to fix the following CVEs are included with help from
+    Vincent Danen and other members of the Red Hat security team:
+
+      CVE-2010-1781 CVE-2010-1782 CVE-2010-1784 CVE-2010-1785
+      CVE-2010-1786 CVE-2010-1787 CVE-2010-1788 CVE-2010-1790
+      CVE-2010-1792 CVE-2010-1793 CVE-2010-2648
+
+================
 WebKitGTK+ 1.2.3
 ================
 
@@ -18,6 +33,9 @@ What's new in WebKitGTK+ 1.2.3?
       CVE-2010-1761 CVE-2010-1762 CVE-2010-1770 CVE-2010-1771
       CVE-2010-1772 CVE-2010-1773 CVE-2010-1774
 
+   Update: CVE-2010-2264 was also addressed in this release, but
+   failed to be listed at release time.
+
 ================
 WebKitGTK+ 1.2.2
 ================
diff --git a/configure.ac b/configure.ac
index 60a3c47..fc83bd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [2])
-m4_define([webkit_micro_version], [3])
+m4_define([webkit_micro_version], [4])
 
 # 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:5:17
+LIBWEBKITGTK_VERSION=19:6:17
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])

-- 
WebKit Debian packaging