doh. belatedly commit the 2.25.3 commit, and then bump to 2.25.4

svn path=/trunk/; revision=1224

diff --git a/ChangeLog b/ChangeLog
index 8e92bf8..b1ba7e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-12-23  Dan Winship  <danw@gnome.org>
 
+       * configure.in: belated post-release bump to 2.25.4
+
        * libsoup/soup-session.c (soup_session_get_features)
        (soup_session_get_feature): add these to query session features.
        #565392.
@@ -29,6 +31,12 @@
        global, to avoid possible future confusion
        (get_url): Likewise with a functional-internal shadowing.
 
+2008-12-15  Dan Winship  <danw@gnome.org>
+
+       * configure.in: 2.25.3
+
+       * NEWS: update
+
 2008-12-09  Dan Winship  <danw@gnome.org>
 
        * libsoup/soup-uri.c (soup_uri_new): Explicitly document the fact

diff --git a/NEWS b/NEWS
index fdcbe04..c0d02e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Changes in libsoup from 2.25.2 to 2.25.3:
+
+       * Fixed a crash when using both cookies and a proxy. [#562191,
+          Mark Lee]
+
+       * Fixed soup_form_decode() to correctly handle forms with
+          URI-encoded parameter names [#563302, Evan Nemerson] and
+          added a regression test.
+
+       * Fixed a crash in SoupProxyResolverGConf. [#563145]
+
 Changes in libsoup from 2.25.1 to 2.25.2:
 
        * Fixed client behavior when presented with multiple auth

diff --git a/configure.in b/configure.in
index d0ffb1a..4d905cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl *** Initialize automake and set version ***
 dnl *******************************************
 
 AC_PREREQ(2.53)
-AC_INIT(libsoup, 2.25.2)
+AC_INIT(libsoup, 2.25.4)
 AC_CONFIG_SRCDIR(libsoup-2.4.pc.in)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)