www/adium.im 892:9d62db401b98: Restore 1.5.10 as the designated ...

[commits at adium.im]

details:	http://hg.adium.im/www/adium.im/rev/9d62db401b98
revision:	892:9d62db401b98
branch:		adiumx.com
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon Feb 01 09:24:00 2016 +0100

Restore 1.5.10 as the designated version for 10.6.8, as the current version of Sparkle does not support it.

Fixes #16984

diffs (82 lines):

diff -r fc065f35141c -r 9d62db401b98 index.php
--- a/index.php	Fri Jan 29 21:57:01 2016 +0100
+++ b/index.php	Mon Feb 01 09:24:00 2016 +0100
@@ -1,6 +1,9 @@
 <?php
-	$downloadText["10.6.8"]   = "1.5.10.1";
-	$downloadLink["10.6.8"]   = "https://adiumx.cachefly.net/Adium_1.5.10.1.dmg";
+	$downloadText["10.7.5"]   = "1.5.10.1";
+	$downloadLink["10.7.5"]   = "https://adiumx.cachefly.net/Adium_1.5.10.1.dmg";
+
+	$downloadText["10.6.8"]   = "1.5.10";
+	$downloadLink["10.6.8"]   = "https://adiumx.cachefly.net/Adium_1.5.10.dmg";
 	
 	$downloadText["10.5.8"]   = "1.4.5";
 	$downloadLink["10.5.8"]   = "https://adiumx.cachefly.net/Adium_1.4.5.dmg";
@@ -15,13 +18,13 @@
 	$downloadLink["10.2"]   = "https://sourceforge.net/projects/adium/files/AdiumX_0.89.1.dmg/download";
 
 	if ($_GET['download'] && !$downloadLink[$_GET['download']])
-		$_GET['download'] = "10.6.8";
+		$_GET['download'] = "10.7.5";
 
 	// OS X check
 	$userAgent = $_SERVER['HTTP_USER_AGENT'];
 
 	// Assuming we're working on 10.6 unless otherwise proven.
-	$operatingSystem = "10.6.8";
+	$operatingSystem = "10.7.5";
 	
 	if (strstr($userAgent, "iPhone") || strstr($userAgent, "iPad") || strstr($userAgent, "iPod")) {
 		$operatingSystem = "iPhone";
@@ -50,7 +53,9 @@
         $micro = intval($versionComponents[2]);
 
         if ($major == 10) {
-            if ($minor >= 6) {
+        	if ($minor >= 7) {
+        		$operatingSystem = "10.7.5";
+        	} else if ($minor >= 6) {
                 $operatingSystem = "10.6.8";
             } else if ($minor == 5) {
                 if ($micro >= 8) {    
@@ -147,8 +152,8 @@
     				            </div>
    								<a href="<?=$downloadLink[$operatingSystem]?>"><span class="downloadlink">Download Adium <?=$downloadText[$operatingSystem]?></span></a>
 							</div>
-							<?php if ($operatingSystem != "10.6.8") { ?>
-								<div class="downloadSub" style="color:red;">If you're using OS X 10.6.8 or above, you should get <a href="/?download=10.6.8">Adium <?=$downloadText["10.6.8"]?></a>.</div>
+							<?php if ($operatingSystem != "10.7.5") { ?>
+								<div class="downloadSub" style="color:red;">If you're using OS X 10.7.5 or above, you should get <a href="/?download=10.7.5">Adium <?=$downloadText["10.7.5"]?></a>.</div>
 							<?php } ?>
 
 							<div class="downloadSub">
@@ -178,7 +183,7 @@
 								<a href="https://trac.adium.im/wiki/Development">Contributing to Adium</a> | <a href="http://forum.adium.im">Adium Forum</a> | <a href="https://trac.adium.im/wiki/AdiumIRCChat">Adium IRC Chat</a>
 							</div>
 							<div class="oldversionwarning">
-							    Adium <?=$downloadText["10.6.8"]?> requires OS X 10.6.8 or newer.<br />
+							    Adium <?=$downloadText["10.7.5"]?> requires OS X 10.7.5 or newer.<br />
 							    For older versions of OS X, see <a href="https://trac.adium.im/wiki/PreviousReleases">the older releases page</a>.
 							</div>
 						</div>
diff -r fc065f35141c -r 9d62db401b98 sparkle/appcast-release.xml
--- a/sparkle/appcast-release.xml	Fri Jan 29 21:57:01 2016 +0100
+++ b/sparkle/appcast-release.xml	Mon Feb 01 09:24:00 2016 +0100
@@ -7,8 +7,15 @@
         <title>Adium 1.5.10.1</title>
         <pubDate>Friday, January 29th, 2015 21:18:07 GMT+1</pubDate>
         <sparkle:releaseNotesLink>https://www.adium.im/changelogs/1.5.10.1.html</sparkle:releaseNotesLink>
+        <sparkle:minimumSystemVersion>10.7.5</sparkle:minimumSystemVersion>
+        <enclosure sparkle:dsaSignature="MCwCFHPDrw41Z6zgzv8zfnCeUV4X0lUcAhRB5Rto6Cs4Uy5zt0b5bTeKZWo8og==" sparkle:version="1.5.10.1" url="https://adiumx.cachefly.net/Adium_1.5.10.1.dmg" length="24811752" type="application/octet-stream"/>
+    </item>
+    <item>
+        <title>Adium 1.5.10</title>
+        <pubDate>Sunday, May 19th, 2014 21:25:14 GMT+1</pubDate>
+        <sparkle:releaseNotesLink>https://www.adium.im/changelogs/1.5.10.html</sparkle:releaseNotesLink>
         <sparkle:minimumSystemVersion>10.6.8</sparkle:minimumSystemVersion>
-        <enclosure sparkle:dsaSignature="MCwCFHPDrw41Z6zgzv8zfnCeUV4X0lUcAhRB5Rto6Cs4Uy5zt0b5bTeKZWo8og==" sparkle:version="1.5.10.1" url="https://adiumx.cachefly.net/Adium_1.5.10.1.dmg" length="24811752" type="application/octet-stream"/>
+        <enclosure sparkle:dsaSignature="MC0CFG8S7oYAEkR+PlgK9Aul+BN4pYCiAhUA059vByxPDitLWuSS+pUwfsDeyqY=" sparkle:version="1.5.10" url="https://adiumx.cachefly.net/Adium_1.5.10.dmg" length="24595712" type="application/octet-stream"/>
     </item>
 	<item>
 	    <title>Adium 1.4.5</title>