drop version back down to 2.2.5 and SOUP_API_VERSION back to 2.2; due toLIBSOUP_2_2_5

	* configure.in: drop version back down to 2.2.5 and
	SOUP_API_VERSION back to 2.2; due to various snafus, there has
	never yet been an official release of the 2.4 API and the GNOME
	2.12 betas have been shipping with libsoup 2.2 tarballs (while
	jhbuild has been using 2.4, with evolution and related packages
	having configure hacks to build against either). As there never
	ended up being any API-incompatible changes in the 2.4 series, we
	can just merge it back into the 2.2 series and kill off 2.4.

	* NEWS: Copy in the 2.2-series news from the gnome-2-10 branch,
	and add new NEWS

	* libsoup-zip.in: s/2.2/@SOUP_API_VERSION@/

	* libsoup/Makefile.am (libsoupincludedir, lib_LTLIBRARIES,
	libsoup_2_2_la_LDFLAGS, libsoup_2_2_la_LIBADD,
	libsoup_2_2_la_SOURCES): s/4/2/ in all the places automake won't
	let us use a variable.

5 files changed, 86 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 6237c378..22c087d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2005-08-01  Dan Winship  <danw@novell.com>
 
+	* configure.in: drop version back down to 2.2.5 and
+	SOUP_API_VERSION back to 2.2; due to various snafus, there has
+	never yet been an official release of the 2.4 API and the GNOME
+	2.12 betas have been shipping with libsoup 2.2 tarballs (while
+	jhbuild has been using 2.4, with evolution and related packages
+	having configure hacks to build against either). As there never
+	ended up being any API-incompatible changes in the 2.4 series, we
+	can just merge it back into the 2.2 series and kill off 2.4.
+
+	* NEWS: Copy in the 2.2-series news from the gnome-2-10 branch,
+	and add new NEWS
+
+	* libsoup-zip.in: s/2.2/@SOUP_API_VERSION@/
+
+	* libsoup/Makefile.am (libsoupincludedir, lib_LTLIBRARIES,
+	libsoup_2_2_la_LDFLAGS, libsoup_2_2_la_LIBADD,
+	libsoup_2_2_la_SOURCES): s/4/2/ in all the places automake won't
+	let us use a variable.
+
+2005-08-01  Dan Winship  <danw@novell.com>
+
 	* libsoup/soup-md5-utils.c (soup_md5_final_hex): Finalize a
 	SoupMD5Context and write out the digest in hex digits.
 
diff --git a/NEWS b/NEWS
index c575769f..c899ef18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,57 @@
-Changes in libsoup from the 2.2 series to 2.4:
+Changes in libsoup from 2.2.4 to 2.2.5:
+
+	* Win32 support (from Tor Lillqvist)
+
+	* Up-to-date API documentation pretty much everywhere
+
+	* Basic XMLRPC support (from Mariano Suarez-Alvarez, Fernando
+	  Herrera, and Jeff Bailey)
+
+	* New HTTP timestamp-manipulation methods soup_date_parse,
+	  soup_date_generate, and soup_date_iso8601_parse.
+
+	* SoupSession now handles relative URLs in the Location header
+          (in violation of RFC 2616, but in line with how some servers
+          behave.) [270688]
+
+Changes from 2.2.3 to 2.2.4:
+
+	* Fixed a problem with NTLM authentication against
+	  multi-domain servers. [306877]
+
+	* Fixed DNS lookups on Solaris. [254551, 268389]
+
+Changes from 2.2.2 to 2.2.3:
+
+	* Now compiles against gnutls 1.2.0 [257811]
+
+	* Fixed a bug that could result in 100% CPU usage if an SSL
+	  server closed the connection uncleanly. [273352]
+
+Changes from 2.2.1 to 2.2.2:
+
+	* The SSL validation fix from 2.2.1 [264414] is now completely
+          fixed. (Part of the fix didn't actually make it into 2.2.1)
+
+	* HTTPS certificate validation now works when using an HTTP
+          proxy. [268583]
+
+	* HTTP proxy code deals better with proxies that try to make
+          the user do HTML-form-based authentication. [268531]
+
+	* 64-bit fixes for NTLM auth code. [270323, from Michael
+          Zucchi]
+
+Changes from 2.2.0 to 2.2.1:
+
+	* Updated for a libgcrypt API change between 1.1.9x and 1.2.x
+          that caused a crash at runtime if you compiled against
+          1.2.x. [266342]
+
+	* SSL certificate validation failure should now always result
+          in a status of SOUP_STATUS_SSL_FAILED, rather than getting
+          turned into SOUP_STATUS_IO_ERROR. [264414]
 
-	* (Nothing yet)
 
 Changes in libsoup from the 2.0 series (1.99.x versions) to 2.2:
 
diff --git a/configure.in b/configure.in
index 0fc53e56..1078669c 100644
--- 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.3.0)
+AC_INIT(libsoup, 2.2.5)
 AC_CONFIG_SRCDIR(libsoup.pc.in)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -11,14 +11,14 @@ AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
 
-SOUP_API_VERSION=2.4
+SOUP_API_VERSION=2.2
 AC_SUBST(SOUP_API_VERSION)
 
 # Increment on interface addition. Reset on removal.
 SOUP_AGE=0
 
 # Increment on interface add, remove, or change.
-SOUP_CURRENT=0
+SOUP_CURRENT=8
 
 # Increment on source change. Reset when CURRENT changes.
 SOUP_REVISION=0
diff --git a/libsoup-zip.in b/libsoup-zip.in
index 86f7c501..cf655abd 100755
--- a/libsoup-zip.in
+++ b/libsoup-zip.in
@@ -12,12 +12,12 @@ rm $ZIP
 current_minus_age=`expr @SOUP_CURRENT@ - @SOUP_AGE@`
 
 zip $ZIP -@ <<EOF
-bin/libsoup-2.4-$current_minus_age.dll
+bin/libsoup-@SOUP_API_VERSION@-$current_minus_age.dll
 EOF
 
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
-include/libsoup-2.4
-lib/libsoup-2.4.dll.a
-lib/pkgconfig/libsoup-2.4.pc
+include/libsoup-@SOUP_API_VERSION@
+lib/libsoup-@SOUP_API_VERSION@.dll.a
+lib/pkgconfig/libsoup-@SOUP_API_VERSION@.pc
 EOF
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index f1045c71..e3ff642d 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -29,7 +29,7 @@ BUILT_SOURCES = $(MARSHAL_GENERATED)
 
 CLEANFILES = $(MARSHAL_GENERATED)
 
-libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
+libsoupincludedir = $(includedir)/libsoup-2.2/libsoup
 
 libsoupinclude_HEADERS =	\
 	soup.h			\
@@ -58,19 +58,19 @@ libsoupinclude_HEADERS =	\
 	soup-xmlrpc-message.h	\
 	soup-xmlrpc-response.h
 
-lib_LTLIBRARIES = libsoup-2.4.la
+lib_LTLIBRARIES = libsoup-2.2.la
 
-libsoup_2_4_la_LDFLAGS =	\
+libsoup_2_2_la_LDFLAGS =	\
 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) $(NO_UNDEFINED)
 
-libsoup_2_4_la_LIBADD =			\
+libsoup_2_2_la_LIBADD =			\
 	$(GLIB_LIBS)			\
 	$(XML_LIBS)			\
 	$(LIBGNUTLS_LIBS_STATIC)	\
 	$(LIBGNUTLS_LIBS)		\
 	$(LIBWS2_32)
 
-libsoup_2_4_la_SOURCES =		\
+libsoup_2_2_la_SOURCES =		\
 	$(MARSHAL_GENERATED)		\
 	soup-address.c			\
 	soup-auth.h			\