Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31010
Modified Files:
pymol-py.info
Log Message:
add fixes recommended by clang and switch to libpng16
Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pymol-py.info 8 Mar 2013 17:04:03 -0000 1.12
+++ pymol-py.info 8 Jun 2013 01:33:43 -0000 1.13
@@ -1,7 +1,7 @@
Info2: <<
Package: pymol-py%type_pkg[python]
Version: 1.5
-Revision: 9
+Revision: 10
UseMaxBuildJobs: false
# Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
Maintainer: Jack Howarth <howa...@bromo.med.uc.edu>
@@ -18,18 +18,21 @@
Source4-MD5: cb4a3906766681ce9230ef5515e1aa1c
PatchFile: pymol-py.patch
PatchFile-MD5: 8048eb990477ee8a404324c864baed57
-PatchFile2: pymol-py-rest.patch
-PatchFile2-MD5: 2df10a5a2d66b16082317a823878bde0
+PatchFile2: pymol-py-clang.patch
+PatchFile2-MD5: 0a15312f84bfb5762f4615569aa984f3
+PatchFile3: pymol-py-rest.patch
+PatchFile3-MD5: 2df10a5a2d66b16082317a823878bde0
SourceDirectory: pymol-%v
-Depends: python%type_pkg[python], libpng15-shlibs, scipy-py%type_pkg[python],
tcltk, pmw-py%type_pkg[python] (>= 1.3.2-1000), freeglut-shlibs, glew-shlibs,
blt-shlibs, meschach-shlibs, freetype219-shlibs
-BuildDepends: libpng15, freeglut, glew, readline5, gdbm3, tcltk-dev, blt,
x11-dev, swig, meschach, freetype219, fink (>= 0.30.0)
+Depends: python%type_pkg[python], libpng16-shlibs, scipy-py%type_pkg[python],
tcltk, pmw-py%type_pkg[python] (>= 1.3.2-1000), freeglut-shlibs, glew-shlibs,
blt-shlibs, meschach-shlibs, freetype219-shlibs
+BuildDepends: libpng16, freeglut, glew, readline6, gdbm3, tcltk-dev, blt,
x11-dev, swig, meschach, freetype219, 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: <<
#! /bin/sh -ex
sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | sed
's|python2.X|python%type_raw[python]|g' | patch -p1
+patch -p1 < %{PatchFile2}
cd ..
-sed 's|@FINKPREFIX@|%p|g' < %{PatchFile2} | sed
's|python2.X|python%type_raw[python]|g' | sed
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
+sed 's|@FINKPREFIX@|%p|g' < %{PatchFile3} | sed
's|python2.X|python%type_raw[python]|g' | sed
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
cd pymol-%v
perl -pi -e 's|self.dialog.activate|\#self.dialog.activate|g'
modules/pmg_tk/startup/apbs_tools.py
perl -pi -e 's/lglew/lGLEW/g' setup.py
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
