lostwages/templates/en download-deb.template d ...

[Jeremy Newman]

ChangeSet ID:	31046
CVSROOT:	/opt/cvs-commit
Module name:	lostwages
Changes by:	jnewman at winehq.org	2007/04/17 16:59:47

Modified files:
	templates/en   : download-deb.template download.template 

Log message:
	Scott Ritchie <scott at open-vote.org>
	* Update download page to reflect what distros deb packages are now
	available for
	* Simplify and update the download-deb page, moving some developer
	content to wiki

Patch: http://cvs.winehq.org/patch.py?id=31046

Old revision  New revision  Changes     Path
 1.14          1.15          +2 -32      lostwages/templates/en/download-deb.template
 1.90          1.91          +2 -2       lostwages/templates/en/download.template

Index: lostwages/templates/en/download-deb.template
diff -u -p lostwages/templates/en/download-deb.template:1.14 lostwages/templates/en/download-deb.template:1.15
--- lostwages/templates/en/download-deb.template:1.14	17 Apr 2007 21:59:47 -0000
+++ lostwages/templates/en/download-deb.template	17 Apr 2007 21:59:47 -0000
@@ -12,12 +12,6 @@ distributions have their own repositorie
 Wine, however we keep our own repository of the latest available packages here 
 for download.</p>
 
-<p>Packages here are designed to function on Ubuntu Edgy (6.10) and Dapper (6.06). 
-Packages here used to also work for Debian unstable, however due to changes in 
-Debian this no longer works and our Ubuntu maintainer is unable to support them. 
-If you can help provide up-to-date Debian packages, please contact 
-<a href=mailto:scott at open-vote.org>Scott Ritchie</a>.</p>
-
 <h2>Adding the WineHQ APT Repository:</h2>
 
 <p>First, open a terminal window.  Then add the repository's key to your system's
@@ -27,6 +21,8 @@ list of trusted APT keys by copy and pas
 
 <p>Next, add the repository to your system's list of APT sources:</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><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><br>
@@ -49,32 +45,6 @@ into the 64-bit distribution and have it
 <a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> 
 for more details.</p>
 
-<h2>Debian Users:</h2>
-
-<p>If you are using Debian and want to make sure that apt-get will install the 
-WineHQ Wine package instead of the Debian Wine package (which sometimes confuses 
-APT by having the same version number), then after following the instructions above
-you will also need to add something like the following entry to /etc/apt/preferences:</p>
-
-<i><p>Package: wine<br>
-Pin: release l=WineHQ APT Repository<br>
-Pin-Priority: 1000</p></i>
-
-<h2>Building the Wine Package from Source using APT:</h2>
-
-<p>APT also allows easy compilation from source of a package.  This is useful if
-there is no binary package available for your architecture, or if you wish to 
-create a fresh .deb file from scratch.  To do this, first follow the 
-instructions for installing from the console above, except instead of running
-apt-get install wine run '<b>apt-get build-dep wine</b>'.  This will download the 
-needed development packages for your system to make the wine package.  Then, 
-run '<b>apt-get --build source wine</b>', have a snack, and wait for the 
-compiling to finish.</p>
-
-<p>To install your newly created package (which should be in whatever directory
-you were in when you ran apt-get --build source), run '<b>dpkg -i wine*.deb</b>' 
-as root.</p>
-
 <h2>Older .deb packages</h2>
 
 <p>Since the APT repository can only hold the latest packages, older versions of 
Index: lostwages/templates/en/download.template
diff -u -p lostwages/templates/en/download.template:1.90 lostwages/templates/en/download.template:1.91
--- lostwages/templates/en/download.template:1.90	17 Apr 2007 21:59:47 -0000
+++ lostwages/templates/en/download.template	17 Apr 2007 21:59:47 -0000
@@ -67,7 +67,7 @@ for post-installation instructions.</b><
 	  <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 Edgy, Dapper, and Breezy</td>
+	 binary and source .debs for Ubuntu Feisty (7.04), Edgy (6.10), and Dapper (6.06)</td>
     <td><a href="mailto:scott at open-vote.org">Scott Ritchie</a></td>
   </tr>
 
@@ -76,7 +76,7 @@ for post-installation instructions.</b><
 	  <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 unstable</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>