[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 35b9391e52bbc69f038b4966773824eb2ba4dd4d
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 19:18:52 2010 +0000

    2010-02-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            Bump version to 1.1.21, and adjust library versioning accordingly.
    
            * configure.ac:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f2540bc..888d070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Bump version to 1.1.21, and adjust library versioning accordingly.
+
+        * configure.ac:
+
 2010-02-05  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 5c55670..5a6283e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        News about 1.1.21.
+
+        * NEWS:
+
 2010-02-05  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS
index 807fca4..4e5bc2c 100644
--- a/WebKit/gtk/NEWS
+++ b/WebKit/gtk/NEWS
@@ -1,4 +1,18 @@
 =================
+WebKitGTK+ 1.1.21
+=================
+
+What's new in WebKitGTK+ 1.1.21?
+
+  - New custom-made GStreamer source element that uses the WebCore
+    network layer to download media data; this makes sure any headers
+    and cookies will automatically get added when making requests.
+  - WebKit will now let libsoup know who the first party for a given
+    message is, making it possible to implement accept/deny policies in
+    Soup.
+  - The usual stream of fixes, and improvements
+
+=================
 WebKitGTK+ 1.1.20
 =================
 
diff --git a/configure.ac b/configure.ac
index 21241a2..16319df 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], [1])
-m4_define([webkit_micro_version], [20])
+m4_define([webkit_micro_version], [21])
 
 # 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=17:0:15
+LIBWEBKITGTK_VERSION=17:1:15
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])

-- 
WebKit Debian packaging