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 2013/01/18 05:02:19 UTC
svn commit: r1435018 - in /subversion/branches/1.7.x: ./ STATUS get-deps.sh
Author: svn-role
Date: Fri Jan 18 04:02:19 2013
New Revision: 1435018
URL: http://svn.apache.org/viewvc?rev=1435018&view=rev
Log:
Reintegrate the 1.7.x-r1352031 branch:
* r1352031
Change get-deps.sh to use zlib 1.2.7.
Justification:
1.2.5 is no longer available for download at the URL get-deps.sh tries.
This prevents get-deps.sh from failling.
Notes:
The branch is needed since get-deps.sh has removed neon on trunk which
causes conflicts.
Branch:
^/subversion/branches/1.7.x-r1352031
Votes:
+1: breser, brane, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/get-deps.sh
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-r1352031:r1431725-1435017
Merged /subversion/trunk:r1352031
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1435018&r1=1435017&r2=1435018&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jan 18 04:02:19 2013
@@ -188,16 +188,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1352031
- Change get-deps.sh to use zlib 1.2.7.
- Justification:
- 1.2.5 is no longer available for download at the URL get-deps.sh tries.
- This prevents get-deps.sh from failling.
- Notes:
- The branch is needed since get-deps.sh has removed neon on trunk which
- causes conflicts.
- Branch:
- ^/subversion/branches/1.7.x-r1352031
- Votes:
- +1: breser, brane, rhuijben
Modified: subversion/branches/1.7.x/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/get-deps.sh?rev=1435018&r1=1435017&r2=1435018&view=diff
==============================================================================
--- subversion/branches/1.7.x/get-deps.sh (original)
+++ subversion/branches/1.7.x/get-deps.sh Fri Jan 18 04:02:19 2013
@@ -27,7 +27,7 @@ APR=apr-1.4.5
APR_UTIL=apr-util-1.3.12
NEON=neon-0.29.6
SERF=serf-0.7.2
-ZLIB=zlib-1.2.5
+ZLIB=zlib-1.2.7
SQLITE_VERSION=3.7.6.3
SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION | sed -e 's/\./ /g'))