2011-09-20 Carlos Garcia Campos <cgarcia@igalia.com>

        [GTK] Update NEWS and configure.ac for 1.5.90 release

        Reviewed by Martin Robinson.

        * configure.ac:

2011-09-20  Philippe Normand  <pnormand@igalia.com>

        [GTK] Update NEWS and configure.ac for 1.5.90 release

        Reviewed by Martin Robinson.

        * NEWS:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95518 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a6397bb..e2f0a28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Update NEWS and configure.ac for 1.5.90 release
+
+        Reviewed by Martin Robinson.
+
+        * configure.ac:
+
 2011-09-19  Adam Barth  <abarth@webkit.org>
 
         Always enable ENABLE(EVENTSOURCE)

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 563a3ab..1382469 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-20  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Update NEWS and configure.ac for 1.5.90 release
+
+        Reviewed by Martin Robinson.
+
+        * NEWS:
+
 2011-09-19  Leandro Pereira  <leandro@profusion.mobi>
 
         GTK DRT leaks memory while comparing history items

diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
index dbfd554..52c68b4 100644 (file)
--- a/Source/WebKit/gtk/NEWS
+++ b/Source/WebKit/gtk/NEWS
@@ -1,3 +1,16 @@
+=================
+WebKitGTK+ 1.5.90
+=================
+
+What's new in WebKitGTK+ 1.5.90?
+
+  - Bumped GStreamer requirement to 0.10.30.
+  - Switch to GTK+3 by default. GTK+2 is still required for the
+    WebKit2 plugin process though.
+  - Create pot files in builddir.
+  - Improvements in the WebKit2GTK+ port.
+  - Lots of bugfixes.
+
 ================
 WebKitGTK+ 1.5.2
 ================

diff --git a/configure.ac b/configure.ac
index 812b932..ab8d864 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,14 +2,14 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [5])
-m4_define([webkit_micro_version], [2])
+m4_define([webkit_micro_version], [90])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
 #
 # Sourced from Source/WebCore/Configurations/Version.xcconfig
-m4_define([webkit_user_agent_major_version], [534])
-m4_define([webkit_user_agent_minor_version], [26])
+m4_define([webkit_user_agent_major_version], [535])
+m4_define([webkit_user_agent_minor_version], [4])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
@@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([Source/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
-LIBWEBKITGTK_VERSION=9:0:9
+LIBWEBKITGTK_VERSION=9:1:9
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])