Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 822F9106AE for ; Wed, 30 Apr 2014 22:32:42 +0000 (UTC) Received: (qmail 65833 invoked by uid 500); 30 Apr 2014 22:32:41 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 65758 invoked by uid 500); 30 Apr 2014 22:32:41 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 65748 invoked by uid 99); 30 Apr 2014 22:32:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2014 22:32:41 +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; Wed, 30 Apr 2014 22:32:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 27DDB2388A36 for ; Wed, 30 Apr 2014 22:32:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r907525 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download.js Date: Wed, 30 Apr 2014 22:32:19 -0000 To: commits@openoffice.apache.org From: buildbot@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140430223220.27DDB2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: buildbot Date: Wed Apr 30 22:32:19 2014 New Revision: 907525 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/download/download.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Wed Apr 30 22:32:19 2014 @@ -1 +1 @@ -1591504 +1591505 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Wed Apr 30 22:32:19 2014 @@ -1 +1 @@ -1591504 +1591505 Modified: websites/staging/ooo-site/trunk/content/download/download.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/download.js (original) +++ websites/staging/ooo-site/trunk/content/download/download.js Wed Apr 30 22:32:19 2014 @@ -179,7 +179,7 @@ function getLink( rel_mode ) { // If platform is too old, then provide a general download link to the archive. if ( OLD_PLATFORM ) { // If platform is Mac OS X <=10.6, then provide a download link with previous AOO version. -/* + if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) { FILENAME = "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_"; @@ -201,7 +201,7 @@ function getLink( rel_mode ) { ERROR = true; return LINK; } -*/ + // If platform is Solaris, FreeBSD or OS/2, // then provide a download link to the porting webpage. if ( UI_PLATFORM == "Solaris x86 (PKG)" || @@ -489,7 +489,7 @@ function getPlatform( rel_mode ) { // Mac OS X? if ( os.indexOf( "mac" ) != -1 ) { UI_PLATFORM = "OS X 64-bit Intel (DMG)"; - URL_PLATFORM = "MacOS_x86_install"; + URL_PLATFORM = "MacOS_x86-64_install"; EXTENSION = ".dmg"; // OS X is 10.6 or older? if ( ua.indexOf( "10.6" ) != -1 || @@ -500,6 +500,7 @@ function getPlatform( rel_mode ) { ua.indexOf( "10_4" ) != -1 || ua.indexOf( "10.3" ) != -1 || ua.indexOf( "10_3" ) != -1 ) { UI_PLATFORM = "Mac OS X (10.6 or older)"; + URL_PLATFORM = "MacOS_x86_install"; if ( rel_mode > 0 ) OLD_PLATFORM = true; }