Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8229
Modified Files: relax-py.patch Log Message: update to 3.0.0 Index: relax-py.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/relax-py.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- relax-py.patch 30 Jan 2013 22:25:25 -0000 1.5 +++ relax-py.patch 15 Aug 2013 16:16:32 -0000 1.6 @@ -1,16 +1,36 @@ -diff -uNr relax-1.3.14/relax relax-1.3.14.fink/relax ---- relax-1.3.14/relax 2012-03-19 12:05:34.000000000 -0400 -+++ relax-1.3.14.fink/relax 2012-04-07 15:02:12.000000000 -0400 +diff -uNr relax-3.0.0/relax relax-3.0.0.fink/relax +--- relax-3.0.0/relax 2013-08-06 09:37:50.000000000 -0400 ++++ relax-3.0.0.fink/relax 2013-08-15 10:37:35.000000000 -0400 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2.X # Import the relax module. import relax -diff -uNr relax-1.3.14/sconstruct relax-1.3.14.fink/sconstruct ---- relax-1.3.14/sconstruct 2012-03-19 12:05:34.000000000 -0400 -+++ relax-1.3.14.fink/sconstruct 2012-04-07 15:02:12.000000000 -0400 -@@ -100,7 +100,7 @@ +diff -uNr relax-3.0.0/scons/install.py relax-3.0.0.fink/scons/install.py +--- relax-3.0.0/scons/install.py 2013-08-06 09:35:04.000000000 -0400 ++++ relax-3.0.0.fink/scons/install.py 2013-08-15 10:37:35.000000000 -0400 +@@ -111,11 +111,11 @@ + ############### + + # Run relax to create the *.pyc files. +- print("\nCreating the byte-compiled *.pyc files.") +- python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` +- cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) +- print(cmd) +- system(cmd) ++ #print("\nCreating the byte-compiled *.pyc files.") ++ #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` ++ #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) ++ #print(cmd) ++ #system(cmd) + + # Final printout. + print("\n\n\n") +diff -uNr relax-3.0.0/sconstruct relax-3.0.0.fink/sconstruct +--- relax-3.0.0/sconstruct 2013-08-06 09:37:50.000000000 -0400 ++++ relax-3.0.0.fink/sconstruct 2013-08-15 10:37:35.000000000 -0400 +@@ -99,7 +99,7 @@ SYS = SYSTEM # Mac OS X installation path. @@ -19,7 +39,7 @@ # All other operating systems. -@@ -117,10 +117,10 @@ +@@ -116,10 +116,10 @@ ############### # Relax installation directory. @@ -32,7 +52,7 @@ # Symbolic link installation path. SYMLINK = BIN_PATH + sep + 'relax' -@@ -533,11 +533,11 @@ +@@ -532,11 +532,11 @@ 'relax_fit.c'] # Construct the python include path (for Python.h). @@ -45,23 +65,16 @@ + py_bin_minpath = 'FINK_PREFIX' + path.sep + 'bin' py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` - # Get the numpy include path (for numpy/arrayobject.h). ---- relax-2.0.0/scons/install.py.orig 2012-06-11 05:50:51.000000000 -0400 -+++ relax-2.0.0/scons/install.py 2012-06-14 08:49:48.000000000 -0400 -@@ -112,11 +112,11 @@ - ############### + # Relaxation curve fitting build environment. +diff -uNr relax-3.0.0/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py relax-3.0.0.fink/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py +--- relax-3.0.0/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py 2013-08-06 09:35:17.000000000 -0400 ++++ relax-3.0.0.fink/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py 2013-08-15 10:38:25.000000000 -0400 +@@ -151,7 +151,7 @@ + + # PyMOL. + pymol.view() +- pymol.command('show spheres'_pseudo_ellipse) ++ pymol.command('show spheres') + pymol.cone_pdb('cone_pseudo_ellipse.pdb') - # Run relax to create the *.pyc files. -- print("\nCreating the byte-compiled *.pyc files.") -- python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` -- cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) -- print(cmd) -- system(cmd) -+ #print("\nCreating the byte-compiled *.pyc files.") -+ #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` -+ #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path) -+ #print(cmd) -+ #system(cmd) - # Final printout. - print("\n\n\n") ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs