You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/02/15 05:04:58 UTC
svn commit: r1568588 - in /subversion/branches/1.7.x: ./ STATUS configure.ac
Author: svn-role
Date: Sat Feb 15 04:04:58 2014
New Revision: 1568588
URL: http://svn.apache.org/r1568588
Log:
Merge the 1.7.x-neon-0.30 branch:
* r1566320
Allow building with Neon 0.30.x.
Justification:
Version 0.30.0 is the latest Neon release, and the only reason that
we cannot use it in 1.7.x is the restriction in configure.ac.
Branch:
^/subversion/branches/1.7.x-neon-0.30
Votes:
+1: brane, breser, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/configure.ac
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-neon-0.30:r1566319-1568587
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1568588&r1=1568587&r2=1568588&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Feb 15 04:04:58 2014
@@ -114,13 +114,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1566320
- Allow building with Neon 0.30.x.
- Justification:
- Version 0.30.0 is the latest Neon release, and the only reason that
- we cannot use it in 1.7.x is the restriction in configure.ac.
- Branch:
- ^/subversion/branches/1.7.x-neon-0.30
- Votes:
- +1: brane, breser, rhuijben
Modified: subversion/branches/1.7.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/configure.ac?rev=1568588&r1=1568587&r2=1568588&view=diff
==============================================================================
--- subversion/branches/1.7.x/configure.ac (original)
+++ subversion/branches/1.7.x/configure.ac Sat Feb 15 04:04:58 2014
@@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
# Either a space-separated list of allowable Neon versions, or "any" to
# mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30"
NEON_RECOMMENDED_VER="0.29.6"
NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
dnl You can skip the neon version check only if you know what you are doing