Unreviewed. Update OptionsGTK.cmake and NEWS for 2.5.2 release.

.:

* Source/cmake/OptionsGTK.cmake: Bump version numbers.

Source/WebKit2:

* gtk/NEWS: Add release notes for 2.5.2.

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

diff --git a/ChangeLog b/ChangeLog
index c45ab0c..53c0de1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.5.2 release.
+
+        * Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] REGRESSION(r166239): The ld version script is not being used

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f729d4b..f1510bb 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.5.2 release.
+
+        * gtk/NEWS: Add release notes for 2.5.2.
+
 2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] No IPC messages are sent when building WebKitGTK+ with VERSION_SCRIPT

diff --git a/Source/WebKit2/gtk/NEWS b/Source/WebKit2/gtk/NEWS
index 40d166d..e15cd0d 100644 (file)
--- a/Source/WebKit2/gtk/NEWS
+++ b/Source/WebKit2/gtk/NEWS
@@ -1,4 +1,21 @@
 =================
+WebKitGTK+  2.5.2
+=================
+
+What's new in WebKitGTK+ 2.5.2?
+
+  - Make GTK+2 dependency optional.
+  - Use the ld version script for non developer builds.
+  - Add webkit_navigation_policy_decision_get_navigation_action() API
+    and deprecated the methods and properties in WebKitNavigationPolicyDecision
+    that are now redundant.
+  - Add support for user scripts to WebKitUserContentManager.
+  - Do not use GtkWindow:resize-grip-visible with recent GTK+ versions.
+  - Fix caps negotiation failure in playback pipeline in GSTreamer media backend.
+  - Rename translation domain to WebKit2GTK-4.0.
+  - Install the processes in a versioned directory.
+
+=================
 WebKitGTK+  2.5.1
 =================
 

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 27538a6..92bdf77 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -2,14 +2,14 @@ include(GNUInstallDirs)
 
 set(PROJECT_VERSION_MAJOR 2)
 set(PROJECT_VERSION_MINOR 5)
-set(PROJECT_VERSION_MICRO 1)
+set(PROJECT_VERSION_MICRO 2)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 set(WEBKITGTK_API_VERSION 4.0)
 
 # Libtool library version, not to be confused with API version.
 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 37 0 0)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 0 0)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 38 0 1)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 1 0)
 
 set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
 set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")