Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 87185 invoked from network); 20 Mar 2006 16:08:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Mar 2006 16:08:23 -0000 Received: (qmail 66351 invoked by uid 500); 20 Mar 2006 16:08:17 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 66301 invoked by uid 500); 20 Mar 2006 16:08:17 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 66282 invoked by uid 99); 20 Mar 2006 16:08:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Mar 2006 08:08:16 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 20 Mar 2006 08:08:13 -0800 Received: (qmail 86815 invoked by uid 65534); 20 Mar 2006 16:07:52 -0000 Message-ID: <20060320160752.86726.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r387228 - in /apr/apr/branches/1.2.x: CHANGES STATUS include/apr_version.h Date: Mon, 20 Mar 2006 16:07:34 -0000 To: commits@apr.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Mon Mar 20 08:07:27 2006 New Revision: 387228 URL: http://svn.apache.org/viewcvs?rev=387228&view=rev Log: - Upcate and sync version numbers with the relality that 1.2.4 was already tagged, but not released -> roll on to 1.2.5 Modified: apr/apr/branches/1.2.x/CHANGES apr/apr/branches/1.2.x/STATUS apr/apr/branches/1.2.x/include/apr_version.h Modified: apr/apr/branches/1.2.x/CHANGES URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/CHANGES?rev=387228&r1=387227&r2=387228&view=diff ============================================================================== --- apr/apr/branches/1.2.x/CHANGES (original) +++ apr/apr/branches/1.2.x/CHANGES Mon Mar 20 08:07:27 2006 @@ -1,4 +1,4 @@ -Changes for APR 1.2.4 +Changes for APR 1.2.5 *) Prevent detection of robust mutex support with glibc 2.4, fixing APR_LOCK_PROC_PTHREAD locks. PR 38442. [Joe Orton] Modified: apr/apr/branches/1.2.x/STATUS URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/STATUS?rev=387228&r1=387227&r2=387228&view=diff ============================================================================== --- apr/apr/branches/1.2.x/STATUS (original) +++ apr/apr/branches/1.2.x/STATUS Mon Mar 20 08:07:27 2006 @@ -3,7 +3,9 @@ Releases: - 1.2.3 : in development + 1.2.5 : in development + 1.2.4 : not released + 1.2.3 : not released 1.2.2 : released October 11, 2005 1.2.1 : released August 18, 2005 1.2.0 : not released Modified: apr/apr/branches/1.2.x/include/apr_version.h URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/include/apr_version.h?rev=387228&r1=387227&r2=387228&view=diff ============================================================================== --- apr/apr/branches/1.2.x/include/apr_version.h (original) +++ apr/apr/branches/1.2.x/include/apr_version.h Mon Mar 20 08:07:27 2006 @@ -59,14 +59,14 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APR_PATCH_VERSION 4 +#define APR_PATCH_VERSION 5 /** * The symbol APR_IS_DEV_VERSION is only defined for internal, * "development" copies of APR. It is undefined for released versions * of APR. */ -#undef APR_IS_DEV_VERSION +#define APR_IS_DEV_VERSION #if defined(APR_IS_DEV_VERSION) || defined(DOXYGEN)