Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8C6D106B4 for ; Tue, 20 Aug 2013 23:05:42 +0000 (UTC) Received: (qmail 37516 invoked by uid 500); 20 Aug 2013 23:05:42 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 37494 invoked by uid 500); 20 Aug 2013 23:05:42 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 37487 invoked by uid 99); 20 Aug 2013 23:05:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Aug 2013 23:05:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Aug 2013 23:05:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A5E242388860; Tue, 20 Aug 2013 23:05:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516020 - in /subversion/branches/1.8.x: ./ STATUS build.conf Date: Tue, 20 Aug 2013 23:05:19 -0000 To: commits@subversion.apache.org From: breser@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130820230519.A5E242388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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__]