r23984 - in /branches/frame_order_cleanup: ./ docs/latex/install.tex -- June 16, 2014 - 18:32

Author: bugman
Date: Mon Jun 16 18:32:49 2014
New Revision: 23984

URL: http://svn.gna.org/viewcvs/relax?rev=23984&view=rev
Log:
Merged revisions 23945 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23945 | bugman | 2014-06-13 17:54:50 +0200 (Fri, 13 Jun 2014) | 17 lines
  
  Reverted r23693 as SciPy is actually still used in the frame order analyses.
  
  The command used was:
  $ svn merge -r23693:r23692 .
  
  .....
    r23693 | bugman | 2014-06-06 14:24:44 +0200 (Fri, 06 Jun 2014) | 6 lines
    Changed paths:
       M /trunk/docs/latex/install.tex
    
    Removed all SciPy references in the installation chapter of the manual.
    
    This is because SciPy is no longer used in the frame order analysis, 
hence it is not used for any
    part of relax.
  .....
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/docs/latex/install.tex

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 16 18:32:49 2014
@@ -1 +1 @@
-/trunk:1-23881
+/trunk:1-23983

Modified: branches/frame_order_cleanup/docs/latex/install.tex
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/install.tex?rev=23984&r1=23983&r2=23984&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/install.tex (original)
+++ branches/frame_order_cleanup/docs/latex/install.tex Mon Jun 16 18:32:49 
2014
@@ -14,6 +14,9 @@
   \item[\href{http://python.org/}{Python}\index{Python}:]  Version 2.5 or 
higher.
   \item[\href{http://numpy.scipy.org/}{NumPy}\index{NumPy}:]  Version 1.0.4 
or higher.
     This package is used for most of the numerical calculations within relax.
+  \item[\href{http://www.scipy.org/}{SciPy}\index{SciPy}:]  Version 0.7.1 or 
higher.
+    This package is optional.
+    It is required only for the frame order theory analyses.
   \item[\href{http://wxpython.org/}{wxPython}\index{wxPython}:]  Version 2.8 
or higher.
     This package is also optional.
     It is required for the operation of the graphical user interface 
(GUI)\index{User interface!GUI}.
@@ -137,7 +140,7 @@
 If the desired version is not available, please download the relevant source 
package below or contact the fink project using the ``Maintainer'' email 
address given in the relax fink pages.
 
 Note that when installing via fink, all the dependencies will be 
automatically selected and installed as well.
-Although automatic, when starting from scratch that there could be well over 
250 source packages that need to be compiled (to set up the full GNU 
compilation chain and other libraries which are then required to build 
Python, numpy, etc.).
+Although automatic, when starting from scratch that there could be well over 
250 source packages that need to be compiled (to set up the full GNU 
compilation chain and other libraries which are then required to build 
Python, numpy, scipy, etc.).
 This may take anywhere between 2 days to over a week (don't forget to 
mention this fact to your poor sys-admin).
 
 The fink relax packages for different Python versions are 
\href{http://pdb.finkproject.org/pdb/package.php/relax-py27}{relax-py27}, 
\href{http://pdb.finkproject.org/pdb/package.php/relax-py26}{relax-py26}, 
\href{http://pdb.finkproject.org/pdb/package.php/relax-py25}{relax-py25} and 
\href{http://pdb.finkproject.org/pdb/package.php/relax-py24}{relax-py24}.