--- a/htdocs/download/ubuntu/index.php Sun Nov 23 13:19:31 2014 -0800
+++ b/htdocs/download/ubuntu/index.php Mon Jun 08 20:56:55 2015 -0400
@@ -1,36 +1,3 @@
- include($_SERVER['DOCUMENT_ROOT'] . "/../inc/downloads.inc");- $exploded_uri = explode('/', $_SERVER['REQUEST_URI']);- $me = $exploded_uri[2];- $page['title'] = $download_types[$me]['title'];- $page['section'] = "Download";- $page['subsect'] = $download_types[$me]['subsect'];- $page['description'] = $download_types[$me]['description'];- include($_SERVER['DOCUMENT_ROOT'] . "/../inc/header.inc");- include($_SERVER['DOCUMENT_ROOT'] . "/../inc/version.inc");-<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/section.download.inc"); ?>-<h1><?php echo $page['subsect']; ?></h1>-<div class="box_download">-<?php echo $download_types[$me]['body'] ?>-<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/footer.inc"); ?>+header("Location: https://pidgin.im/download/linux"); --- a/inc/blurb.downloaddetect.inc Sun Nov 23 13:19:31 2014 -0800
+++ b/inc/blurb.downloaddetect.inc Mon Jun 08 20:56:55 2015 -0400
@@ -13,11 +13,6 @@
$download_link = "http://sourceforge.net/projects/pidgin/files/Pidgin/$pidgin_win32_version/pidgin-$pidgin_win32_version.exe/download";
$download_have_direct_link = true;
$download_version = $pidgin_win32_version;
- } else if (strstr($useragent, "Ubuntu")) {- $download_type = "ubuntu";- $download_os = "for Ubuntu";- $download_link = "/download/ubuntu/";- $download_version = $pidgin_ubuntu_version; } else if (strstr($useragent, "Linux")) {
$download_type = "linux";
$download_os = "for Linux";
--- a/inc/downloads.inc Sun Nov 23 13:19:31 2014 -0800
+++ b/inc/downloads.inc Mon Jun 08 20:56:55 2015 -0400
@@ -30,36 +30,11 @@
<p>If you would like to have GTK+ included in the installer, we have an <a href="http://sourceforge.net/projects/pidgin/files/Pidgin/' . $pidgin_win32_version . '/pidgin-' . $pidgin_win32_version . '-offline.exe/download">offline installer</a> that bundles everything except spell-checking dictionaries. </p>',
- 'title' => 'Download Pidgin for Ubuntu Linux',- 'description' => 'Download the free Pidgin universal chat client for Ubuntu Linux',- 'body' => '<p>Ubuntu ships Pidgin but does not update it after a release (except for security issues and high-severity bugs). For those users who desire new releases of Pidgin, we have packaged Pidgin in <a href="https://launchpad.net/~pidgin-developers/+archive/ppa/">a PPA</a>. If you encounter problems with these packages, try <a href="../source">building from source</a> and <a href="/support">report the bug</a>.</p>-<p>To setup <a href="https://launchpad.net/~pidgin-developers/+archive/ppa/">the PPA</a>, follow these steps: <br />- 1. Click to download the <a href="https://launchpad.net/~pidgin-developers/+archive/ppa/+files/pidgin-ppa_0.0.7_all.deb">Pidgin PPA package</a>.<br />- 2. Select <em>Open with:</em> and <em>GDebi Package Installer</em>. Click <em>OK</em>.<br />- 3. Click <em>Install Package</em>.<br />- 4. Click <em>Close</em>. Then close GDebi.-<p>After doing this, check for and apply updates: <br />- 1. Click <em>System</em>, point to <em>Administration</em>, and click <em>Update Manager</em>.<br />- 2. Click <em>Check</em>.<br />- 3. Click <em>Install Updates</em>.<br />-<p>Future Pidgin updates will show up in Update Manager along with the usual Ubuntu updates.</p>-<p>This PPA often lags behind the source releases a couple of days, so please be patient.</p>-<p><b>This PPA supports Ubuntu Precise (12.04) and newer.</b></p>', 'title' => 'Download Pidgin for Linux',
- 'subsect' => 'Other Linux', 'description' => 'Download the free Pidgin universal chat client for Linux',
- 'body' => '<p>We do not provide pre-built packages for most Linux and Unix distributions. We recommend installing Pidgin using your operating system\'s standard package management tool.</p>+ 'body' => '<p>We do not provide pre-built packages for Linux and Unix distributions. We recommend installing Pidgin using your operating system\'s standard package management tool.</p> <p>If your operating system doesn\'t provide a pre-built package, or if their pre-built package is out of date and you want to upgrade, then you can try <a href="/download/source/">building from source</a>.</p>',
--- a/inc/section.download.inc Sun Nov 23 13:19:31 2014 -0800
+++ b/inc/section.download.inc Mon Jun 08 20:56:55 2015 -0400
@@ -2,8 +2,7 @@
$sub_sections['Windows'] = "/download/windows/";
-$sub_sections['Ubuntu'] = "/download/ubuntu/";-$sub_sections['Other Linux'] = "/download/linux/";+$sub_sections['Linux'] = "/download/linux/"; $sub_sections['Mac OS X'] = "/download/mac/";
$sub_sections['Source'] = "/download/source/";
--- a/inc/version.inc Sun Nov 23 13:19:31 2014 -0800
+++ b/inc/version.inc Mon Jun 08 20:56:55 2015 -0400
@@ -5,7 +5,3 @@
// Current Windows Pidgin Release
$pidgin_win32_version = "2.10.11";
-// Version of Pidgin in the Ubuntu PPA-$pidgin_ubuntu_version = "2.10.10";