Jeremy Newman : Scott Ritchie <scott at open-vote.org>

Jeremy Newman jnewman at winehq.org
Fri Oct 19 09:52:09 CDT 2007


Module: website
Branch: master
Commit: a7596032addea851b7bf6d681bfb37581b73fb5d
URL:    http://source.winehq.org/git/website.git/?a=commit;h=a7596032addea851b7bf6d681bfb37581b73fb5d

Author: Jeremy Newman <jnewman at codeweavers.com>
Date:   Fri Oct 19 09:30:18 2007 -0500

Scott Ritchie <scott at open-vote.org>
Update download-deb and download page for Ubuntu Gutsy

---

 templates/en/download-deb.template |   24 +++++++++++++-----------
 templates/en/download.template     |   26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template
index 1d78f60..c716eb0 100644
--- a/templates/en/download-deb.template
+++ b/templates/en/download-deb.template
@@ -25,6 +25,8 @@ list of trusted APT keys by copy and pasting the following:</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>
@@ -39,18 +41,18 @@ using the Synaptic Package Manager under System->Administration.  Alternatively,
 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>
 
-<h2>64-bit Users:</h2>
+<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>
 
-<p>Packages for the 64 bit version of Ubuntu Feisty (7.04) are now available, however 
-for users of Debian and older Ubuntus the entries above are for i386 users only. 
-Attempting to use these repositories with a different architecture will result 
-in 404 errors as APT will be looking for files not in the repository.</p>
+<h2>64-bit Users:</h2>
 
-<p>If you are using an older 64 bit distribution and would still like a working Wine package,
-there is a relatively easy hack that can be used to install the 32-bit package
-into the 64-bit distribution 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 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>
 
 <h2>Older .deb packages</h2>
 
@@ -58,7 +60,7 @@ for more details.</p>
 the packages are available at 
 <a href=http://wine.budgetdedicated.com/archive/index.html>the WineHQ .deb packages archive</a>.</p>
 
-<p>If you wish to use these packages, you'll have to install them by hand, such as by double clicking them or using dpkg -i</p>
+<p>You can install the packages by double-clicking on them.</p>
 
 <br>
 <p><i>Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.</i></p>
diff --git a/templates/en/download.template b/templates/en/download.template
index 33dc3d7..7df2fb6 100644
--- a/templates/en/download.template
+++ b/templates/en/download.template
@@ -22,7 +22,7 @@ for post-installation instructions.</b></p>
 
   <tr bgcolor="#ffffff">
     <td align=center><a href="{$root}/site/download-rh">
-	  <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a>
+      <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a>
     </td>
     <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a></b>
         binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and
@@ -36,27 +36,27 @@ for post-installation instructions.</b></p>
   
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=79444">
-	  <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a>
+      <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a>
     </td>
     <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b>
          release binary and source .rpms and daily snapshot RPMs for SUSE Linux 9.3, 10.0, 10.1, and openSUSE 10.2.<br/>
-	 </td>
+     </td>
     <td><a href="mailto:meissner at suse.de">Marcus Meissner</a></td>
   </tr>
   
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=80066">
-	  <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a>
+      <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a>
     </td>
     <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=80066">Mandriva</a></b> 
          binary .rpms for Mandriva Linux 2006 and 2007. Download the 2007.1 package if your Mandriva is a 2007.1
-	 release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td>
+     release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td>
     <td><a href="mailto:marco at mandrivaclub.nl">Marco Meijer</a></td>
   </tr>
   
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=6301">
-	  <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a>
+      <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a>
     </td>
     <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&amp;package_id=6301">Slackware</a></b>
          binary .tgz for Slackware 10.2</td>
@@ -65,25 +65,25 @@ for post-installation instructions.</b></p>
   
   <tr bgcolor="#ffffff">
     <td align=center><a href="{$root}/site/download-deb">
-	  <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a>
+      <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 Feisty (7.04), Edgy (6.10), and Dapper (6.06)</td>
+     binary and source .debs for Ubuntu Gutsy (7.10), Feisty (7.04), Edgy (6.10), and Dapper (6.06)
     <td><a href="mailto:scott at open-vote.org">Scott Ritchie</a></td>
   </tr>
 
   <tr bgcolor="#ffffff">
     <td align=center><a href="{$root}/site/download-deb">
-	  <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a>
+      <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a>
     </td>
     <td> <b><a href="{$root}/site/download-deb">Debian</a></b> 
-	 binary and source .debs for Debian Etch (4.0)</td>
+     binary and source .debs for Debian Etch (4.0)</td>
     <td><a href="mailto:scott at open-vote.org">Scott Ritchie</a></td>
   </tr>
 
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://www.freshports.org/emulators/wine/">
-	  <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a>
+      <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a>
     </td>
     <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> 
          source for FreeBSD 5.3 or later</td>
@@ -92,7 +92,7 @@ for post-installation instructions.</b></p>
 
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://www.pbidir.com/search.php?str=wine">
-	  <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a>
+      <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a>
     </td>
     <td> <b><a href="http://www.pbidir.com/search.php?str=wine">PC-BSD</a></b> 
          binary packages .pbi for PC-BSD (FreeBSD based OS)</td>
@@ -101,7 +101,7 @@ for post-installation instructions.</b></p>
 
   <tr bgcolor="#ffffff">
     <td align=center><a href="http://www.blastwave.org/wine/">
-	  <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a>
+      <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a>
     </td>
     <td> <b><a href="http://www.blastwave.org/wine/">Solaris</a></b>
          binary and source for Solaris 9 and 10</td>




More information about the wine-cvs mailing list