[Translation] [Fwd: web/download upgrade-old.en.php,NONE,1.1 upgrade.en.php,1.2,1.3]

Update of /cvsroot/fink/web/download
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31641

Modified Files:
	upgrade.en.php
Added Files:
	upgrade-old.en.php
Log Message:

New upgrade.en.php -- old one renamed to upgrade-old.en.php.


--- NEW FILE: upgrade-old.en.php ---
<?
$title = "Prior Upgrade Matrix";
$cvs_author = '$Author: alexkhansen $';
$cvs_date = '$Date: 2005/07/30 22:47:05 $';

include "header.inc";
?>

<h1>Fink Upgrade Matrix (deprecated version)</h1>

<p>
Any version of Fink since release 0.2.0 can be upgraded to the latest
release in place.
This even includes the GIMP installs from MacGIMP.com and OpenOSX.com;
the first releases of both are based on Fink 0.2.1.
The following table helps you find the best way to update your Fink
installation.
</p>
<p>
If you're unsure which version of Fink you have, run
"<code>fink --version</code>" in a Terminal window.
</p>
<p>
If you are upgrading from a Fink release prior to 0.3.1, and you have
tetex installed, you should run the command "fink remove tetex"
before upgrading.  (It may also be necessary to remove the packages
which depend on tetex, such as lyx, before tetex can be removed.)
Afterwards you can again install tetex and the other packages you removed.
</p>
<?
include "../fink_version.inc";
?>

<p>
Due to the SourceForge website reorganization in spring 2002 and the move
of our binary distribution in summer 2002, upgrading has become slightly
complicated.  Please be sure to follow the upgrade instructions very
carefully to ensure a successful upgrade.  There are separate instructions
for binary installations and for source installations.
</p>
<p>If you are having trouble upgrading a source installation, consult
<a href="fix-upgrade.php">these special instructions.</a></p>
<?
it_start();
it_item('<b>Current installation (binary release)</b>', '<b>Upgrade 
method</b>');
it_item("Fink official binary distribution, version 0.5.x and later",
   '<p>Update normally through <tt>dselect</tt>: Choose "[U]pdate",
   then "[I]nstall".
Or in <tt>FinkCommander</tt>, run "Update" followed by
"Dist-Upgrade" (both in the <tt>Binary</tt> menu).</p>');
it_item("Fink official binary distribution, version 0.3.x or 0.4.x",
   '<p>Update using either the <a href="10.1-upgrade.php">Upgrade
   instructions for 10.1</a> or the <a href="10.2-upgrade.php">Upgrade
   instructions for 10.2</a>.</p>');
it_item("Fink official binary distribution, version 0.2.x",
   '<p>Try the <a href="puma-kit.php">Original 10.1 Upgrade Kit</a>. 
(The Fink
maintainers are no longer able to test this upgrade path.)</p>');
it_item("MacGIMP or OpenOSX.com install of Fink 0.2.1",
   '<p>Try the <a href="puma-kit.php">Original 10.1 Upgrade Kit</a>. 
(The Fink
maintainers are no longer able to test this upgrade path.)
   Make sure you install the <code>system-xfree86</code>
   package before updating the bulk of packages.</p>');
it_item('<b>Current installation (source release)</b>', '<b>Upgrade 
method</b>');
it_item("Fink source release 0.2.5 or newer",
   '<p>Run "<tt>fink selfupdate</tt>".  If you are upgrading from 10.1 to
   10.2, you may need to do this twice to be fully updated.</p>');
it_item("Fink source release 0.2.4 or older (down to 0.2.0)",
   "<p>If upgrading under OS X 10.1,
download the <a
 
href=\"http://prdownloads.sourceforge.net/fink/packages-0.4.1.tar.gz\">packages
   tarball</a>, unpack it using the <tt>tar</tt> utility and run
   \"<code>./inject.pl</code>\" inside the packages-0.4.1
   directory.</p><p>
If upgrading under OS X 10.2, download the <a
 
href=\"http://prdownloads.sourceforge.net/fink/dists-$fink_version.tar.gz\">dists
   tarball</a>, unpack it using the <tt>tar</tt> utility and run
   \"<code>./inject.pl</code>\" inside the
   dists-$fink_version directory.</p>");
it_end();
?>


<?
include "footer.inc";
?>

Index: upgrade.en.php
===================================================================
RCS file: /cvsroot/fink/web/download/upgrade.en.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- upgrade.en.php	13 Jun 2005 15:53:48 -0000	1.2
+++ upgrade.en.php	30 Jul 2005 22:47:05 -0000	1.3
@@ -5,80 +5,53 @@

  include "header.inc";
  ?>
-
+<?
+include "../fink_version.inc";
+?>
  <h1>Fink Upgrade Matrix</h1>
-
+<p>(For OS X versions>= 10.2)</p>
+<h3>Same OS:</h3>
  <p>
-Any version of Fink since release 0.2.0 can be upgraded to the latest
-release in place.
-This even includes the GIMP installs from MacGIMP.com and OpenOSX.com;
-the first releases of both are based on Fink 0.2.1.
-The following table helps you find the best way to update your Fink
-installation.
+All current versions of Fink can be upgraded in place to the latest 
release for the
+corresponding Mac OSX version, i.e. <strong>do not</strong> download 
the new installer!
  </p>
  <p>
-If you're unsure which version of Fink you have, run
+Check the version of Fink you have by running
  "<code>fink --version</code>" in a Terminal window.
  </p>
-<p>
-If you are upgrading from a Fink release prior to 0.3.1, and you have
-tetex installed, you should run the command "fink remove tetex"
-before upgrading.  (It may also be necessary to remove the packages
-which depend on tetex, such as lyx, before tetex can be removed.)
-Afterwards you can again install tetex and the other packages you removed.
-</p>
-<?
-include "../fink_version.inc";
-?>
-
-<p>
-Due to the SourceForge website reorganization in spring 2002 and the move
-of our binary distribution in summer 2002, upgrading has become slightly
-complicated.  Please be sure to follow the upgrade instructions very
-carefully to ensure a successful upgrade.  There are separate instructions
-for binary installations and for source installations.
-</p>
-<p>If you are having trouble upgrading a source installation, consult
-<a href="fix-upgrade.php">these special instructions.</a></p>
-<?
-it_start();
-it_item('<b>Current installation (binary release)</b>', '<b>Upgrade 
method</b>');
-it_item("Fink official binary distribution, version 0.5.x and later",
-  '<p>Update normally through <tt>dselect</tt>: Choose "[U]pdate",
-  then "[I]nstall".
-Or in <tt>FinkCommander</tt>, run "Update" followed by
-"Dist-Upgrade" (both in the <tt>Binary</tt> menu).</p>');
-it_item("Fink official binary distribution, version 0.3.x or 0.4.x",
-  '<p>Update using either the <a href="10.1-upgrade.php">Upgrade
-  instructions for 10.1</a> or the <a href="10.2-upgrade.php">Upgrade
-  instructions for 10.2</a>.</p>');
-it_item("Fink official binary distribution, version 0.2.x",
-  '<p>Try the <a href="puma-kit.php">Original 10.1 Upgrade Kit</a>. 
(The Fink
-maintainers are no longer able to test this upgrade path.)</p>');
-it_item("MacGIMP or OpenOSX.com install of Fink 0.2.1",
-  '<p>Try the <a href="puma-kit.php">Original 10.1 Upgrade Kit</a>. 
(The Fink
-maintainers are no longer able to test this upgrade path.)
-  Make sure you install the <code>system-xfree86</code>
-  package before updating the bulk of packages.</p>');
-it_item('<b>Current installation (source release)</b>', '<b>Upgrade 
method</b>');
-it_item("Fink source release 0.2.5 or newer",
-  '<p>Run "<tt>fink selfupdate</tt>".  If you are upgrading from 10.1 to
-  10.2, you may need to do this twice to be fully updated.</p>');
-it_item("Fink source release 0.2.4 or older (down to 0.2.0)",
-  "<p>If upgrading under OS X 10.1,
-download the <a
- 
href=\"http://prdownloads.sourceforge.net/fink/packages-0.4.1.tar.gz\">packages
-  tarball</a>, unpack it using the <tt>tar</tt> utility and run
-  \"<code>./inject.pl</code>\" inside the packages-0.4.1
-  directory.</p><p>
-If upgrading under OS X 10.2, download the <a
- 
href=\"http://prdownloads.sourceforge.net/fink/dists-$fink_version.tar.gz\">dists
-  tarball</a>, unpack it using the <tt>tar</tt> utility and run
-  \"<code>./inject.pl</code>\" inside the
-  dists-$fink_version directory.</p>");
-it_end();
-?>
+<p>You can compare this to the latest available versions for your OS at 
<a href="../../pdb/package.php/fink">the package database</a>.</p>
+<h2>Binary Update</h2>
+<p>Update through <tt>dselect</tt>: Choose "[U]pdate",
+  then "[I]nstall", or by running "<tt>sudo apt-get update ; sudo 
apt-get dist-upgrade</tt>".</p>
+<p>Or in <em>FinkCommander</em>, run "Update" followed by
+"Dist-Upgrade" (both in the <tt>Binary</tt> menu).</p>
+<h2>Source Update</h2>
+<p>Run "<tt>fink selfupdate</tt>".</p>
+<p>Or in <em>FinkCommander</em>, run Source->selfupdate.</p>
+<h3>New OS version:</h3>
+<p>Each OS X update has required a different strategy, and specific 
instructions will be noted on the <a 
href="http://fink.sourceforge.net/">main page</a> to elucidate whatever 
is required. </p>
+<h2>Binary Update</h2>
+<ol>
+<li>Update Fink as above in the <em>Binary Update</em> item within the 
<em>Same OS</em> section to the latest version for your current OS.</li>
+<li>If you think you may build from source at some point, you should 
remove your old Developer Tools by running
+"<tt>/Developer/Tools/uninstall-devtools.pl</tt>" in a terminal.</li>
+<li>Update the OS.</li>
+<li>Update Fink again.</li>
+<li>Then if you decide to build anything from source install a 
Developer Tools (XCode) version appropriate for your OS.</li>
+</ol>
+<p></p>
+<h2>Source Update</h2>
+<p>The general strategy (valid for all supported OS versions as of this 
writing) is as follows:</p>
+<ol><li>Update Fink to the latest appropriate version supported by your 
OS (as above in the <em>Source Update</em> item in the <em>Same OS 
</em>section)--you need not turn on the unstable tree.</li>
+<li>Remove your old Developer Tools by running 
"<tt>/Developer/Tools/uninstall-devtools.pl</tt>" in a terminal.</li>
+<li>Then update your OS.</li>
+<li>Run "<tt>/sw/lib/fink/postinstall.pl</tt>" in a terminal--this will 
redirect Fink to the correct distribution for your OS version.</li>
+<li>Run "<tt>fink scanpackages</tt>" in the terminal 
(Source->scanpackages for Fink Commander users).</li>
+<li>Run "<tt>sudo apt-get update</tt>" in the terminal 
(Binary->update).</li>
+<p>(The above two commands get rid of binary-distribution related 
errors.)</p>
+<li>Run "<tt>fink selfupdate</tt>" in the terminal 
(Source->selfupdate).</li></ol>

+<p>Note:  A prior version of this document (appropriate for older Fink 
versions) can be found <a href=upgrade-old.en.php>here</a>.</p>

  <?
  include "footer.inc";



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click


-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click