svn commit: r1449186 - in /subversion/trunk: INSTALL configure.ac get-deps.sh tools/dev/unix-build/Makefile.svn

[cm...@apache.org]

Author: cmpilato
Date: Fri Feb 22 19:55:39 2013
New Revision: 1449186

URL: http://svn.apache.org/r1449186
Log:
Finish issue #4296 ("svn 1.8 blocks on release of serf 1.2.x").

(This will probably light up the buildbots...)

* INSTALL,
* configure.ac,
* get-deps.sh,
* tools/dev/windows-build/Makefile,
* tools/dev/unix-build/Makefile.svn
  Bump our Serf dependency to version 1.2.0.

Modified:
    subversion/trunk/INSTALL
    subversion/trunk/configure.ac
    subversion/trunk/get-deps.sh
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/INSTALL
URL: http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1449186&r1=1449185&r2=1449186&view=diff
==============================================================================
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Fri Feb 22 19:55:39 2013
@@ -307,7 +307,7 @@ I.    INTRODUCTION
       newer. The autogen.sh script knows about that.
 
 
-      5.  Serf library 1.1 or newer (http://code.google.com/p/serf/) (OPTIONAL)
+      5.  Serf library 1.2 or newer (http://code.google.com/p/serf/) (OPTIONAL)
 
       If you want your client to be able to speak to an Apache
       server (via a http:// or https:// URL), you must link against

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1449186&r1=1449185&r2=1449186&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri Feb 22 19:55:39 2013
@@ -125,7 +125,7 @@ dnl Search for pkg-config
 AC_PATH_PROG(PKG_CONFIG, pkg-config)
 
 dnl Search for serf
-SVN_LIB_SERF(1,0,0)
+SVN_LIB_SERF(1,2,0)
 
 if test "$svn_lib_serf" = "yes"; then
   AC_DEFINE([SVN_HAVE_SERF], 1,

Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1449186&r1=1449185&r2=1449186&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Fri Feb 22 19:55:39 2013
@@ -25,7 +25,7 @@
 
 APR=apr-1.4.6
 APR_UTIL=apr-util-1.5.1
-SERF=serf-1.1.1
+SERF=serf-1.2.0
 ZLIB=zlib-1.2.7
 SQLITE_VERSION=3.7.15.1
 SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION | sed -e 's/\./ /g'))

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1449186&r1=1449185&r2=1449186&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Feb 22 19:55:39 2013
@@ -71,7 +71,7 @@ GNU_ICONV_VER	= 1.14
 APR_UTIL_VER	= 1.4.1
 HTTPD_VER	= 2.2.22
 NEON_VER	= 0.29.6
-SERF_VER	= 1.1.0
+SERF_VER	= 1.2.0
 SERF_OLD_VER	= 0.3.1
 CYRUS_SASL_VER	= 2.1.25
 SQLITE_VER	= 3071201