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

.:

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

Source/WebKit2:

* gtk/NEWS: Add release notes for 2.6.1.

Canonical link: https://commits.webkit.org/154760.82@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

@@ -1,3 +1,9 @@
+2014-10-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.6.1 release.
+
+        * Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2014-09-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [Gtk] build.sh needs a -- before make options when the build command is cmake --build

Source/WebKit2/ChangeLog

@@ -1,3 +1,9 @@
+2014-10-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.6.1 release.
+
+        * gtk/NEWS: Add release notes for 2.6.1.
+
 2014-10-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Fix make distcheck.

Source/WebKit2/gtk/NEWS

@@ -1,8 +1,26 @@
+=================
+WebKitGTK+  2.6.1
+=================
+
+What's new in WebKitGTK+ 2.6.1?
+
+  - Ensure WebKitWebView:is-loading is TRUE right after a new load starts.
+  - Fix a crash in the plugin process with some windowed flash plugins.
+  - Allow to dock the inspector again once undocked when building with
+    GTK+ >= 3.10.
+  - TLS errors now take precedence over the HTTP authentication dialog.
+  - Do not shrink on-disk cache to its default size on startup.
+  - Improve the proportion and visibility of some web inspector icons.
+  - Fix GTK+2 plugins not working after being updated.
+  - Don't include full path names in WebKitEnumTypes.h to ensure the
+    generated headers are always identical.
+  - Translation updates: Telugu, Hindi.
+
 =================
 WebKitGTK+  2.6.0
 =================
 
-What's new in WebKitGTK+ 2.4.0?
+What's new in WebKitGTK+ 2.6.0?
 
   - Make vimeo videos work again with the GStreamer media backend.
   - Add more free icons for the web inspector.

Source/cmake/OptionsGTK.cmake

@@ -2,14 +2,14 @@ include(GNUInstallDirs)
 
 set(PROJECT_VERSION_MAJOR 2)
 set(PROJECT_VERSION_MINOR 6)
-set(PROJECT_VERSION_MICRO 0)
+set(PROJECT_VERSION_MICRO 1)
 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 39 1 2)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 4 0)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 39 2 2)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 5 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.")