You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/08/21 01:05:19 UTC
svn commit: r1516020 - in /subversion/branches/1.8.x: ./ STATUS build.conf
Author: breser
Date: Tue Aug 20 23:05:19 2013
New Revision: 1516020
URL: http://svn.apache.org/r1516020
Log:
Merge the r1507889 group from trunk:
* r1507889, r1507891
davautocheck: use the correct apxs binary by default.
Justification:
Convenience aside, without this patch, davautocheck would use the wrong
apxs binary when invoked "by hand" (not via make).
Votes:
+1: danielsh, breser, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build.conf
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1506047
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1516020&r1=1516019&r2=1516020&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Aug 20 23:05:19 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1506047
- Add swig_diff target to the __SWIG_PERL__ and __SWIG_RUBY__ targets in
- build.conf
- Justification:
- These targets should build all swig modules for the language.
- Votes:
- +1: rhuijben, breser, rschupp
-
* r175
Fix symlink attack on svnpubsub's pidfile. Pick up r175 from upstream
of daemonize.py
Modified: subversion/branches/1.8.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build.conf?rev=1516020&r1=1516019&r2=1516020&view=diff
==============================================================================
--- subversion/branches/1.8.x/build.conf (original)
+++ subversion/branches/1.8.x/build.conf Tue Aug 20 23:05:19 2013
@@ -1263,13 +1263,13 @@ lang = python
[__SWIG_PERL__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = perl
[__SWIG_RUBY__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = ruby
[__JAVAHL__]