October 2007 - Wine-commits

Alexander Nicolaysen Sørnes : Fix return page when processing bugs from the version view
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: fb2c29e4ee446fa5c0265c72bdc4a7b330e5c538 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fb2c29e4ee446fa5c0265c72… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 18 10:46:57 2007 +0200 Fix return page when processing bugs from the version view --- include/bugs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 6e28be0..79db0d2 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -574,7 +574,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n"; if ($oBuglink->bQueued) { - echo "<td align=center>[<a href='objectManager.php?sClass=bug&iId=".$oBuglink->iLinkId."&sAction=edit&sSubmit=Submit&bIsQueue=true&sReturnTo=".$oVersion->objectMakeUrl()."'>OK</a>]</td>\n"; + echo "<td align=center>[<a href='".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true'>OK</a>]</td>\n"; } else { echo "<td align=center>Yes</td>\n";

1 0

Alexander Nicolaysen Sørnes : objectManager: Add action var to form tag when adding entries
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: 9770cc95836810748102b04ca2c35541398cf35c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9770cc95836810748102b04c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 21 13:24:39 2007 +0200 objectManager: Add action var to form tag when adding entries --- include/objectManager.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 75de915..9212633 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -758,7 +758,9 @@ class ObjectManager $oObject->objectDisplayAddItemHelp(); } - echo "<form method=\"post\">\n"; + echo "<form method=\"post\" action=\"".$this->makeUrl("add")."\">\n"; + + echo $this->makeUrlFormData(); $aVars = $this->get_custom_vars($aClean, "add");

1 0

Alexander Nicolaysen Sørnes : Use objectManager to add comments
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: 9acdadfc34422bf9e54113876fdcde5c53cbe0c0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9acdadfc34422bf9e5411387… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 21 13:33:43 2007 +0200 Use objectManager to add comments --- include/comment.php | 132 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 106 insertions(+), 26 deletions(-) diff --git a/include/comment.php b/include/comment.php index 703cf62..d26f088 100644 --- a/include/comment.php +++ b/include/comment.php @@ -163,11 +163,6 @@ class Comment { return true; } - function getOutputEditorValues($aClean) - { - /* Stub */ - } - /** * Removes the current comment from the database. @@ -200,48 +195,65 @@ class Comment { return $oRow->cnt; } - /** - * class static functions - */ + function getOutputEditorValues($aClean) + { + $this->sSubject = $aClean['sSubject']; + $this->sBody = $aClean['sBody']; + $this->iParentId = $aClean['iThread']; + $this->iVersionId = $aClean['iVersionId']; + + if(!$this->oOwner) + $this->oOwner = $_SESSION['current']; + + if(!$this->sDateCreated) + $this->sDateCreated = date("l F jS Y, H:i"); + } /** * display a single comment (in $oRow) */ function view_app_comment($oRow) { + $oComment = new comment(null, $oRow); + $oComment->display(); + } + + function display() + { echo html_frame_start('','98%'); echo '<table width="100%" border="0" cellpadding="2" cellspacing="1">',"\n"; // message header - echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$oRow->commentId."></a>\n"; - echo " <b>".$oRow->subject."</b><br />\n"; - echo " by ".forum_lookup_user($oRow->userId)." on ".$oRow->time."<br />\n"; + echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$this->iCommentId."></a>\n"; + echo " <b>".$this->sSubject."</b><br />\n"; + echo " by ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated."<br />\n"; echo "</td></tr><tr><td>\n"; // body - echo htmlify_urls($oRow->body), "<br /><br />\n"; + echo htmlify_urls($this->sBody), "<br /><br />\n"; // only add RE: once - if(eregi("RE:", $oRow->subject)) - $subject = $oRow->subject; + if(eregi("RE:", $this->sSubject)) + $sSubject = $this->sSubject; else - $subject = "RE: ".$oRow->subject; + $sSubject = "RE: ".$this->sSubject; + $oVersion = new version($this->iVersionId); + $oM = new objectManager("comment", "Post new ocmment"); + $oM->setReturnTo($oVersion->objectMakeUrl()); // reply post buttons - echo " [<a href=\"addcomment.php?iAppId=$oRow->appId&iVersionId=$oRow->versionId\"><small>post new</small></a>] \n"; - echo " [<a href=\"addcomment.php?iAppId=$oRow->appId&iVersionId=$oRow->versionId&sSubject=". - urlencode("$subject")."&iThread=$oRow->commentId\"><small>reply to this</small></a>] \n"; + echo " [<a href=\"".$oM->makeUrl("add")."&iAppId=$this->iAppId&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n"; + echo " [<a href=\"".$oM->makeUrl("add")."&iAppId=$this->iAppId&iVersionId=$this->iVersionId&sSubject=". + urlencode("$sSubject")."&iThread=$this->iCommentId\"><small>reply to this</small></a>] \n"; echo "</td></tr>\n"; - $oComment = new comment($oRow->commentId); // delete message button, for admins - if ($oComment->canEdit()) + if ($this->canEdit()) { - $oVersion = new version($oRow->versionId); echo "<tr>"; echo "<td><form method=\"post\" name=\"sMessage\" action=\"".BASE."objectManager.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n"; - echo "<input type=\"hidden\" name=\"iId\" value=\"$oRow->commentId\" />"; + echo "<input type=\"hidden\" name=\"iId\" value=\"$this->iCommentId\" />"; echo "<input type=\"hidden\" name=\"sClass\" value=\"comment\" />"; echo "<input type=\"hidden\" name=\"bQueued\" value=\"false\" />"; echo "<input type=\"hidden\" name=\"sAction\" value=\"delete\" />"; @@ -474,7 +486,9 @@ class Comment { echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">',"\n"; echo '<tr><td bgcolor="#C0C0C0" align="center"><table border="0" cellpadding="0" cellspacing="0"><tr bgcolor="#C0C0C0">',"\n"; - + + $oVersion = new version($versionId); + // message display mode changer if ($_SESSION['current']->isLoggedIn()) { @@ -482,7 +496,6 @@ class Comment { if (!empty($aClean['sCmode'])) $_SESSION['current']->setPref("comments:mode", $aClean['sCmode']); - $oVersion = new version($versionId); $sel[$_SESSION['current']->getPref("comments:mode", "threaded")] = 'selected'; echo '<td><form method="post" name="sMode" action="'. $oVersion->objectMakeUrl().'">',"\n"; @@ -498,9 +511,15 @@ class Comment { // blank space echo '<td>   </td>',"\n"; - + + $oM = new objectManager("comment", "Add comment"); + $oM->setReturnTo($oVersion->objectMakeUrl()); + // post new message button - echo '<td><form method="post" name="sMessage" action="addcomment.php"><input type="submit" value="post new comment" class="button"> ',"\n"; + echo '<td><form method="post" name="sMessage" action="objectManager.php">'; + echo '<input type="hidden" name="sAction" value="add" />'; + echo $oM->makeUrlFormData(); + echo '<input type="submit" value="Post new comment" class="button"> ',"\n"; echo '<input type="hidden" name="iVersionId" value="'.$versionId.'"></form></td>',"\n"; //end comment format table @@ -541,6 +560,67 @@ class Comment { echo '</td></tr></table>',"\n"; } + function allowAnonymousSubmissions() + { + return TRUE; + } + + function objectGetCustomVars($sAction) + { + switch($sAction) + { + case "add": + return array("iThread", "iAppId", "iVersionId"); + + default: + return null; + } + } + + function outputEditor($aClean) + { + $sMesTitle = "<b>Post New Comment</b>"; + + if($aClean['iThread'] > 0) + { + $hResult = query_parameters("SELECT * FROM appComments WHERE commentId = '?'", + $aClean['iThread']); + $oRow = query_fetch_object($hResult); + if($oRow) + { + $sMesTitle = "<b>Replying To ...</b> $oRow->subject\n"; + echo html_frame_start($oRow->subject,500); + echo htmlify_urls($oRow->body), "<br /><br />\n"; + echo html_frame_end(); + } + } + + echo "<p align=\"center\">Enter your comment in the box below."; + echo "</br>Please do not paste large terminal or debug outputs here.</p>"; + + echo html_frame_start($sMesTitle,500,"",0); + + echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; + echo "<tr class=\"color0\"><td align=right><b>From:</b> </td>\n"; + echo " <td> ".$_SESSION['current']->sRealname."</td></tr>\n"; + echo "<tr class=\"color0\"><td align=right><b>Subject:</b> </td>\n"; + echo " <td> <input type=\"text\" size=\"35\" name=\"sSubject\" value=\"".$this->sSubject."\" /> </td></tr>\n"; + echo "<tr class=\"color1\"><td colspan=2><textarea name=\"sBody\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$this->sBody."</textarea></td></tr>\n"; + + echo "</table>\n"; + + echo html_frame_end(); + + echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\" />\n"; + echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$aClean['iAppId']."\" />\n"; + echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\" />\n"; + } + + function objectShowPreview() + { + return TRUE; + } + function objectMakeUrl() { $oVersion = new version($this->iVersionId);

1 0

Alexander Nicolaysen Sørnes : Fix maintainer processing
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: 5672f2e82b2ce1dd458b135890802abf9ae4fa09 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5672f2e82b2ce1dd458b1358… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 21 12:25:38 2007 +0200 Fix maintainer processing --- include/maintainer.php | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 6927979..3496292 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -237,7 +237,7 @@ class maintainer $oUser = new User($this->iUserId); if(!$oUser->isSuperMaintainer($this->iAppId) && - ((!$this->bSuperMaintainer && !$oUser->isMaintainer($this->iVersionId)) | $this->bSuperMaintainer)) + ((!$this->bSuperMaintainer && !$oUser->isMaintainer($this->iVersionId)) || $this->bSuperMaintainer)) { /* unqueue the maintainer entry */ $hResult = query_parameters("UPDATE appMaintainers SET queued='false' WHERE userId = '?' AND maintainerId = '?'", @@ -855,13 +855,19 @@ class maintainer $oApp = new Application($this->iAppId); $oVersion = new Version($this->iVersionId); + echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$oApp->iAppId."\" />\n"; + echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$oVersion->iVersionId."\" />\n"; + //app name echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Name:</b></td>',"\n"; echo "<td>".$oApp->objectMakeLink()."</td></tr>\n"; //version - echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Version:</b></td>',"\n"; - echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n"; + if($oVersion->iVersionId) + { + echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Version:</b></td>',"\n"; + echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n"; + } //maintainReason echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>Maintainer request reason:</b></td>',"\n";

1 0

Alexander Nicolaysen Sørnes : Tell the user not to submit screenshots of installers, error messages etc.
by Chris Morgan 21 Oct '07

21 Oct '07

Module: appdb Branch: master Commit: 6df84f117072d13da3dd4e7e5b2b7f738bcfda7b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6df84f117072d13da3dd4e7e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 18 12:05:42 2007 +0200 Tell the user not to submit screenshots of installers, error messages etc. --- screenshots.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/screenshots.php b/screenshots.php index ffa33ca..05fd022 100644 --- a/screenshots.php +++ b/screenshots.php @@ -134,7 +134,8 @@ if($hResult && query_num_rows($hResult)) if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) { echo "<p align=\"center\">When submitting screenshots please ensure that the focus is on the application running inside Wine."; - echo "<br />This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop.</p>"; + echo "<br />This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop."; + echo "<br />Do not upload screenshots of error messages, installers, game menus etc.</p>"; echo '<form enctype="multipart/form-data" action="screenshots.php" name="sImageForm" method="post">',"\n"; echo html_frame_start("Upload Screenshot","400","",0);

1 0

Chris Morgan : Check numeric values against null via !== null. Fixes cases where a cellpadding or width of 0 will not be output because if (value) was false.
by Chris Morgan 20 Oct '07

20 Oct '07

Module: appdb Branch: master Commit: 7a1d3efb1cc9b0a596f54cbf2cf1592d514c940a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7a1d3efb1cc9b0a596f54cbf… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sat Oct 20 18:31:29 2007 -0400 Check numeric values against null via !== null. Fixes cases where a cellpadding or width of 0 will not be output because if(value) was false. --- include/table.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/table.php b/include/table.php index 7dfc4b1..07c42bd 100644 --- a/include/table.php +++ b/include/table.php @@ -425,16 +425,16 @@ class Table if($this->sWidth) $sStr.= ' width="'.$this->sWidth.'"'; - if($this->iBorder) + if($this->iBorder !== null) $sStr.= ' border="'.$this->iBorder.'"'; if($this->sAlign) $sStr.= ' align="'.$this->sAlign.'"'; - if($this->iCellSpacing) + if($this->iCellSpacing !== null) $sStr.= ' cellspacing="'.$this->iCellSpacing.'"'; - if($this->iCellPadding) + if($this->iCellPadding !== null) $sStr.= ' cellpadding="'.$this->iCellPadding.'"'; $sStr.= ">"; // close the open table element

1 0

Tony Lambregts : Show if an Application has a Super Maintainer
by Chris Morgan 20 Oct '07

20 Oct '07

Module: appdb Branch: master Commit: b074048c57b9da424e37701d16a4f973f682a975 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b074048c57b9da424e37701d… Author: Tony Lambregts <tony.lambregts(a)gmail.com> Date: Sat Oct 20 06:39:01 2007 -0600 Show if an Application has a Super Maintainer --- include/version.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/version.php b/include/version.php index 1fdf04c..0f91e7e 100644 --- a/include/version.php +++ b/include/version.php @@ -1427,6 +1427,7 @@ class version { $oTableRow->AddTextCell("Vendor"); $oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("Version"); + $oTableRow->AddTextCell("Has Super Maintainer"); return $oTableRow; } @@ -1536,12 +1537,19 @@ class version { $oApp = new application($this->iAppId); $oVendor = new vendor($oApp->iVendorId); + $aSuper_maintainers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId); + if($aSuper_maintainers) + $bHasSuperMaintainer = true; + else + $bHasSuperMaintainer = false; + $oTableRow = new TableRow(); $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($oVendor->objectMakeLink()); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCell($this->sName); + $oTableRow->AddCell(new TableCell($bHasSuperMaintainer ? "Yes" : "No")); $oOMTableRow = new OMTableRow($oTableRow); return $oOMTableRow;

1 0

Jan Zerebecki : bug/edit: Move AppDB below Summary.
by Jeremy Newman 19 Oct '07

19 Oct '07

Module: bugzilla Branch: master Commit: 65373001fb449db9e820aa991371cfbac876db1f URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=65373001fb449db9e820a… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Oct 8 18:57:42 2007 +0200 bug/edit: Move AppDB below Summary. --- template/en/default/bug/edit.html.tmpl | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 521733a..212a1bb 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -144,16 +144,6 @@ <fieldset> <legend>Details</legend> <table> - <tr> - <td align="right"> - <b><a href="http://appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">AppDB</a>:</b> - </td> - <td colspan="2"> - <a href="http://appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show - Apps affected by this bug</a> - </td> - </tr> - [%# *** Summary *** %] <tr> <td align="right"> @@ -163,6 +153,16 @@ maxlength => 255 %] </tr> + <tr> + <td align="right"> + <b>AppDB:</b> + </td> + <td colspan="2"> + <a href="http://appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show + Apps affected by this bug</a> + </td> + </tr> + <tr> <td colspan="3"> <table>

1 0

Jan Zerebecki : index: Replace CVS with Git link.
by Jeremy Newman 19 Oct '07

19 Oct '07

Module: bugzilla Branch: master Commit: f5b093e764f90688f0bee92b33889e7ae31a05c5 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=f5b093e764f90688f0bee… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Oct 8 18:57:14 2007 +0200 index: Replace CVS with Git link. --- template/en/default/index.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 1a3aafc..1e435fb 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -144,7 +144,7 @@ function addSidebar() { </li> <li> Make sure you are using the latest stable version or a build from - <a href="http://www.winehq.org/site/cvs">CVS</a>, if + <a href="http://www.winehq.org/site/git">Git</a>, if similar bugs have recently been fixed and committed. </li> <li>

1 0

Jeremy Newman : Scott Ritchie <scott@open-vote.org>
by Jeremy Newman 19 Oct '07

19 Oct '07

Module: website Branch: master Commit: a7596032addea851b7bf6d681bfb37581b73fb5d URL: http://source.winehq.org/git/website.git/?a=commit;h=a7596032addea851b7bf6d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 19 09:30:18 2007 -0500 Scott Ritchie <scott(a)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&package_id=7…"> - <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(a)suse.de">Marcus Meissner</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> - <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&package_id=8…">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(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <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&package_id=6…">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(a)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(a)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>

1 0