Module: website Branch: master Commit: 8238f8dbacba18546e645d1359dbd9e50d5ae71a URL: http://source.winehq.org/git/website.git/?a=commit;h=8238f8dbacba18546e645d1...
Author: Scott Ritchie scott@open-vote.org Date: Sun Dec 6 14:25:57 2009 -0800
Update Ubuntu install instructions
Update ubuntu install instructions
From 303aa1f6aedd1ac1812cf121c743c0e9068d62d2 Mon Sep 17 00:00:00 2001
From: Scott Ritchie <scott@scott-laptop.(none)> Date: Sun, 6 Dec 2009 14:21:58 -0800 Subject: Update Ubuntu install instructions
---
images/distro/ubuntu-ppa.png | Bin 0 -> 58532 bytes templates/en/download/deb.template | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png new file mode 100644 index 0000000..d839cfc Binary files /dev/null and b/images/distro/ubuntu-ppa.png differ diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 6f44d0a..b843618 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -3,7 +3,7 @@
<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine for Ubuntu and Ubuntu derivatives -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1>
<p>Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of @@ -27,7 +27,7 @@ beta packages.</i></p> <b>System->Administration->Software Sources</b>. Then select the <b>Third Party Software</b> tab and click <b>Add</b>.</p>
-<img src="{$root}/images/distro/ubuntu-softwaresources1.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0">
<p>Then, <b>copy and paste one of the lines below</b> depending on which version you are running.</p> @@ -41,7 +41,7 @@ version you are running.</p> <p><b>For Ubuntu Hardy (8.04):</b><br> <i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p>
-<h2>Trusting the WineHQ APT Repository:</h2> +<h2>Trusting the WineHQ APT Repository (9.04 and earlier):</h2>
<p>After adding the repository, you also need to add the key for the repository to your system's list of trusted keys. Ubuntu 9.10 users may skip this step.</p> @@ -82,10 +82,14 @@ the packages are available at
<p>It is also possible to add the Wine repositories and install via the command line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu -derivatives.</p> +derivatives. You will need to run these in a terminal window.</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 +<h3>For 9.10 (Karmic):</h3> + +<p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> + +<h3>For 9.04 and earlier:</h3> +<p>Add the repository's key to your system's list of trusted APT keys by copy and pasting the following into your terminal:</p>
<p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p>