Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv19523

Modified Files:
        pymol-py.info 
Log Message:
pymol fixes for 10.7

Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- pymol-py.info       8 Jul 2011 21:53:16 -0000       1.43
+++ pymol-py.info       26 Jul 2011 01:08:29 -0000      1.44
@@ -1,12 +1,13 @@
 Info2: <<
 Package: pymol-py%type_pkg[python]
 Version: 1.4
-Revision: 4
+Revision: 6
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
 Type: python (2.5 2.6 2.7)
+# r3959
 #Source: mirror:sourceforge:fink/pymol-%v-src.tar.bz2
 Source: http://diablo.ucsc.edu/~wgscott/pymol/pymol-%v-src.tar.bz2
-Source-MD5: 8b157de4f61f4b76ca5316e793e15029
+Source-MD5: c520de57b1b3ad7fbc891057a4e32c3e
 Source2: http://www.weizmann.ac.il/ISPC/eMovie.py
 Source2-MD5: 832252d4cee1ba88d50a35681b5ecd4b
 Source3: http://www.weizmann.ac.il/ISPC/eMovie_rigimol.inp
@@ -15,9 +16,11 @@
 Source4-MD5: cb4a3906766681ce9230ef5515e1aa1c
 PatchFile: pymol-py.patch
 PatchFile-MD5: ee777e18ad893e1be061f0bd3abe05c3
+PatchFile2: pymol-scipy.patch
+PatchFile2-MD5: 09a486091a5cfe8c7e299a9f18446239
 SourceDirectory: pymol-%v
-Depends: python%type_pkg[python], libpng3-shlibs, numeric-py%type_pkg[python], 
tcltk, pmw-py%type_pkg[python] (>= 1.3.2-1000), freeglut-shlibs, glew-shlibs, 
blt-shlibs, meschach-shlibs
-BuildDepends: libpng3, freeglut, glew, db43-ssl (>= 4.3.29-1001)|db43 (>= 
4.3.29-1001), readline (>= 4.3-1028), gdbm3, tcltk-dev, blt, x11-dev, swig, 
meschach, fink (>= 0.24.12)
+Depends: python%type_pkg[python], libpng3-shlibs, scipy-py%type_pkg[python], 
tcltk, pmw-py%type_pkg[python] (>= 1.3.2-1000), freeglut-shlibs, glew-shlibs, 
blt-shlibs, meschach-shlibs
+BuildDepends: libpng3, freeglut, glew, readline5, gdbm3, tcltk-dev, blt, 
x11-dev, swig, meschach, fink (>= 0.30.0)
 Conflicts: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25, pymol-py26, 
pymol-py27
 Replaces: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25, pymol-py26, 
pymol-py27
 PatchScript: <<
@@ -25,6 +28,7 @@
 cd ..
 sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | sed 
's|python2.X|python%type_raw[python]|g' | sed 
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
 cd pymol-%v
+patch -p1 < %{PatchFile2}
 perl -pi -e 's|self.dialog.activate|\#self.dialog.activate|g'  
modules/pmg_tk/startup/apbs_tools.py
 <<
 CompileScript: <<
@@ -35,6 +39,9 @@
 esac
 make -f Makefile.delsci
 cd %b/../pynmr_0.37f_src/pmg_tk/startup/pynmr
+perl -pi -e 's|Numeric import|numpy.oldnumeric import|g' *.py
+perl -pi -e 's|LinearAlgebra import|numpy.oldnumeric.linear_algebra import|g' 
*.py
+perl -pi -e 's|import MLab|import numpy.oldnumeric.mlab as MLab|g' *.py
 ./run.macos
 <<
 InstallScript: <<
@@ -79,7 +86,7 @@
 DescPackaging: <<
 The tarball used for this version was created in accordance to the BSD
 license of pymol using the following instructions...
-   svn -r3945 co https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol 
pymol-1.4
+   svn -r3959 co https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol 
pymol-1.4
    tar --exclude=.svn -jcvf pymol-1.4-src.tar.bz2 pymol-1.4
 Added eMovie.py plug-in manually.  Commented out line that opens the window 
for eMovie by
 default every time pymol is started as this is annoying behavior. eMovie is 
activated via 


------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to