Module: website Branch: master Commit: 31cb52b1f9b0f3897443fc14a6396b42265bb0f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=31cb52b1f9b0f3897443fc1...
Author: Scott Ritchie scott@open-vote.org Date: Tue Apr 22 03:53:44 2008 -0700
Update download and download-deb for Ubuntu Hardy
Update download and download-deb pages for Ubuntu Hardy; simplify instructions and remove old versions of Ubuntu not receiving updates.
Thanks, Scott Ritchie
From 180d0dd65c9352a157ddad6a5343cf21a405ec3b Mon Sep 17 00:00:00 2001
From: Scott Ritchie <scott@scott-desktop.(none)> Date: Tue, 22 Apr 2008 03:49:09 -0700 Subject: Update download and download-deb page for Ubuntu Hardy; simplify instructions.
---
templates/en/download-deb.template | 49 ++++++++++++++---------------------- templates/en/download.template | 2 +- 2 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 2cf6894..0e117c9 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -4,55 +4,44 @@ Wine for Ubuntu, Debian, and Debian-based distributions <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1>
-<p>Debian and Debian-based distributions, such as Ubuntu, utilize a special tool +<p>Debian and Debian-based distributions such as Ubuntu utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based -distributions have their own repositories of software, many of which include -Wine, however we keep our own repository of the latest available packages here -for download.</p> +distributions have their own repositories of software that include Wine, +however we keep our own repository of the latest available packages here for +download.</p>
-<p>There used to be graphical instructions here, however we have found that the terminal commands are actually simpler to -describe and quicker for the user to input. Because the commands below use sudo, you may have to enter your user +<p>There used to be graphical instructions here, however we have found that the +terminal commands are actually simpler to describe and quicker for the user to +input. Because the commands below use sudo, you may have to enter your user password after hitting enter.</p>
<h2>Adding the WineHQ APT Repository:</h2>
-<p>First, open a terminal window. Then add the repository's key to your system's -list of trusted APT keys by copy and pasting the following:</p> +<p>First, open a terminal window (Applications->Accessories->Terminal). Then +add the repository's key to your system's list of trusted APT keys by copy and +pasting the following:</p>
<p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p>
<p>Next, add the repository to your system's list of APT sources:</p>
-<p><b>For Ubuntu Gutsy (7.10):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/gutsy.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Ubuntu Feisty (7.04):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Ubuntu Edgy (6.10):</b> <i>*64-bit packages not available*</i><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Ubuntu Dapper (6.06):</b> <i>*64-bit packages not available*</i><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list</i></p> +<p><b>For Ubuntu Hardy (8.04):</b><br> +<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p><b>For Debian Etch (4.0):</b><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list</i></p>
-<p>Then, you can install Wine from WineHQ like it were any other package, such as by -using the Synaptic Package Manager under System->Administration. Alternatively, you -can install from the terminal by running '<b>sudo apt-get update</b>' to update APT's -package information and then '<b>sudo apt-get install wine</b>'.</p> +<p>Then, you can install Wine by <a href="apt://wine">clicking this link</a>. +Alternatively, you can install by going to Applications->Add/Remove and +searching for Wine.</p>
<h2>Upgrading to a new version of Ubuntu</h2>
-<p>If you are upgrading the entire system, such as going from Ubuntu 7.04 to 7.10, you will need to -come back to this page and enter the command for the new version above. The built in update manager -will not switch the Wine repository automatically.</p> - -<h2>64-bit Users:</h2> - -<p>If you are using a very old version of Ubuntu where 64 bit packages are not available -and would still like a working Wine package, there is a relatively easy hack that can be -used to install the 32-bit package and have it function normally. See -<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details.</p> +<p>If you are upgrading the entire system, such as going from Ubuntu 7.10 to +8.04, you will need to come back to this page and enter the command for the new +version above. The built in update manager will not switch the Wine repository +automatically.</p>
<h2>Older .deb packages</h2>
diff --git a/templates/en/download.template b/templates/en/download.template index 8f7dd71..d0bbd9a 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -69,7 +69,7 @@ for post-installation instructions.</b></p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deb">Ubuntu</a></b> - binary and source .debs for Ubuntu Gutsy (7.10), Feisty (7.04), Edgy (6.10), and Dapper (6.06) + binary and source .debs for Ubuntu Hardy (8.04) <td><a href="mailto:scott@open-vote.org">Scott Ritchie</a></td> </tr>