Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1468146 - in /subversion/branches/1.8.x: ./ INSTALL
 STATUS
Date: Mon, 15 Apr 2013 17:10:21 -0000
To: commits@subversion.apache.org
From: svn-role@apache.org
Message-Id: <20130415171021.9710523889D5@eris.apache.org>

Author: svn-role
Date: Mon Apr 15 17:10:21 2013
New Revision: 1468146

URL: http://svn.apache.org/r1468146
Log:
Merge r1467668 from trunk:

 * r1467668
   Update INSTALL about in-tree dependencies (from get-deps.sh)
   Justification:
     Less misinformation for anyone building from source.
   Votes:
     +1 (non-binding): mattiase
     +1: rhuijben (documentation change doesn't need full voting process)

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/INSTALL
    subversion/branches/1.8.x/STATUS

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1467668

Modified: subversion/branches/1.8.x/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/INSTALL?rev=1468146&r1=1468145&r2=1468146&view=diff
==============================================================================
--- subversion/branches/1.8.x/INSTALL (original)
+++ subversion/branches/1.8.x/INSTALL Mon Apr 15 17:10:21 2013
@@ -173,12 +173,13 @@ I.    INTRODUCTION
       'get-deps.sh', is available in the same directory as this file.
       When run, it will place 'apr', 'apr-util', 'serf', 'zlib', and
       'sqlite-amalgamation' directories directly into your unpacked Subversion
-      distribution, where they will be automatically configured and built by
-      Subversion's build process.
+      distribution.  With the exception of sqlite-amalgamation, they will
+      still need to be configured, built and installed explicitly, and
+      Subversion's own configure script may need to be told where to find
+      them, if they were not installed in standard system locations.
 
       Note: there are optional dependencies (such as openssl, swig, and httpd)
-      which get-deps.sh does not download and Subversion does not attempt to
-      configure or build.
+      which get-deps.sh does not download.
 
       Note: Because previous builds of Subversion may have installed older
       versions of these libraries, you may want to run some of the cleanup

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1468146&r1=1468145&r2=1468146&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Apr 15 17:10:21 2013
@@ -40,14 +40,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1467668
-   Update INSTALL about in-tree dependencies (from get-deps.sh)
-   Justification:
-     Less misinformation for anyone building from source.
-   Votes:
-     +1 (non-binding): mattiase
-     +1: rhuijben (documentation change doesn't need full voting process)
-
  * 1.8.x-svn_fs_info-removal
    Remove an API that is #define'd away and not compiled, as well as
    fs-loader.h parts of it.