/www/pidgin: 96658ad8ea6a: Eliminate the Ubuntu-PPA download option
Richard Laager <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 96658ad8ea6ab5e23f078c826970d96dfa9c3c7a Author: Richard Laager <[email protected]> Date: 2015-06-08 20:56 -0400 Branch: default URL: https://hg.pidgin.im/www/pidgin/rev/96658ad8ea6a Description: Eliminate the Ubuntu-PPA download option diffstat: htdocs/download/ubuntu/index.php | 35 +---------------------------------- inc/blurb.downloaddetect.inc | 5 ----- inc/downloads.inc | 29 ++--------------------------- inc/section.download.inc | 3 +-- inc/version.inc | 4 ---- 5 files changed, 4 insertions(+), 72 deletions(-) diffs (122 lines): diff --git a/htdocs/download/ubuntu/index.php b/htdocs/download/ubuntu/index.php --- a/htdocs/download/ubuntu/index.php +++ b/htdocs/download/ubuntu/index.php @@ -1,36 +1,3 @@ <?php - 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"); -?> - -<div id="content"> - -<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/section.download.inc"); ?> - -<div class="box_right"> -<div id="main"> - -<h1><?php echo $page['subsect']; ?></h1> - -<div class="box_download"> - -<?php echo $download_types[$me]['body'] ?> - -</div> - -</div> -</div> - -</div> - -<?php include($_SERVER['DOCUMENT_ROOT'] . "/../inc/footer.inc"); ?> +header("Location: https://pidgin.im/download/linux"); diff --git a/inc/blurb.downloaddetect.inc b/inc/blurb.downloaddetect.inc --- a/inc/blurb.downloaddetect.inc +++ b/inc/blurb.downloaddetect.inc @@ -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"; diff --git a/inc/downloads.inc b/inc/downloads.inc --- a/inc/downloads.inc +++ b/inc/downloads.inc @@ -30,36 +30,11 @@ include($_SERVER['DOCUMENT_ROOT'] . "/.. <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>', ), - 'ubuntu' => array( - 'title' => 'Download Pidgin for Ubuntu Linux', - 'subsect' => 'Ubuntu', - '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> - -<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> - -<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>', - ), - 'linux' => array( 'title' => 'Download Pidgin for Linux', - 'subsect' => 'Other Linux', + 'subsect' => '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>', ), diff --git a/inc/section.download.inc b/inc/section.download.inc --- a/inc/section.download.inc +++ b/inc/section.download.inc @@ -2,8 +2,7 @@ // Define Sub Sections $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/"; diff --git a/inc/version.inc b/inc/version.inc --- a/inc/version.inc +++ b/inc/version.inc @@ -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"; -?> _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits