Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23068
Modified Files:
ccpnmr-py.patch
Log Message:
assume ownership and update to 2.0.7
Index: ccpnmr-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccpnmr-py.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccpnmr-py.patch 6 Apr 2008 04:17:21 -0000 1.8
+++ ccpnmr-py.patch 11 Apr 2009 18:58:32 -0000 1.9
@@ -10,7 +10,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-...@prefix@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/analysis/AnalysisGui.py
$1 $2 $3 $4 $5
+...@prefix@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/analysis/AnalysisGui.py
$1 $2 $3 $4 $5
diff -urN ccpnmr.orig/bin/formatConverter ccpnmr/bin/formatConverter
--- ccpnmr.orig/bin/formatConverter 1970-01-01 01:00:00.000000000 +0100
+++ ccpnmr/bin/formatConverter 2005-12-23 20:44:06.000000000 +0000
@@ -37,9 +37,9 @@
+fi
+
+...@prefix@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/analysis/NmrPipeData.py
$1 $2 $3
-diff -urN ccpnmr.orig/ccpnmr1.0/c/environment-opengl.txt
ccpnmr/ccpnmr1.0/c/environment-opengl.txt
---- ccpnmr.orig/ccpnmr1.0/c/environment-opengl.txt 1970-01-01
01:00:00.000000000 +0100
-+++ ccpnmr/ccpnmr1.0/c/environment-opengl.txt 2005-12-23 21:37:59.000000000
+0000
+diff -urN ccpnmr.orig/ccpnmr2.0/c/environment-opengl.txt
ccpnmr/ccpnmr1.0/c/environment-opengl.txt
+--- ccpnmr.orig/ccpnmr2.0/c/environment-opengl.txt 1970-01-01
01:00:00.000000000 +0100
++++ ccpnmr/ccpnmr2.0/c/environment-opengl.txt 2005-12-23 21:37:59.000000000
+0000
@@ -0,0 +1,44 @@
+#Environment file for use with fink to build ccpnmr suite - environment.txt
+
@@ -85,30 +85,9 @@
+GL_LIB = -lfreeglut -lGLU -lGL
+GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -...@prefix@/include
+GL_LIB_FLAGS = -L$(GL_DIR)/lib -...@prefix@/lib
-diff -urN ccpnmr.orig/ccpnmr1.0/python/ccpnmr/analysis/Util.py
ccpnmr/ccpnmr1.0/python/ccpnmr/analysis/Util.py
---- ccpnmr.orig/ccpnmr1.0/python/ccpnmr/analysis/Util.py 2005-12-22
15:16:50.000000000 +0000
-+++ ccpnmr/ccpnmr1.0/python/ccpnmr/analysis/Util.py 2005-12-30
14:10:29.000000000 +0000
-@@ -73,13 +73,13 @@
-
- graphics_handlers = []
- try:
-- import memops.c.TkHandler
-- graphics_handlers.append('Tk')
-+ import memops.c.GlHandler
-+ graphics_handlers.append('OpenGL')
- except:
- pass
- try:
-- import memops.c.GlHandler
-- graphics_handlers.append('OpenGL')
-+ import memops.c.TkHandler
-+ graphics_handlers.append('Tk')
- except:
- pass
-
-diff -urN ccpnmr.orig/ccpnmr1.0/c/ccp/structure/Makefile
ccpnmr/ccpnmr1.0/c/ccp/structure/Makefile
---- ccpnmr.orig/ccpnmr1.0/c/ccp/structure/Makefile 2006-01-13
21:52:17.000000000 +0000
-+++ ccpnmr/ccpnmr1.0/c/ccp/structure/Makefile 2006-01-13 21:56:46.000000000
+0000
+diff -urN ccpnmr.orig/ccpnmr2.0/c/ccp/structure/Makefile
ccpnmr/ccpnmr1.0/c/ccp/structure/Makefile
+--- ccpnmr.orig/ccpnmr2.0/c/ccp/structure/Makefile 2006-01-13
21:52:17.000000000 +0000
++++ ccpnmr/ccpnmr2.0/c/ccp/structure/Makefile 2006-01-13 21:56:46.000000000
+0000
@@ -35,11 +35,11 @@
$(GLOBAL_DIR)/py_ps_handler.o \
$(GLOBAL_DIR)/py_tk_handler.o
@@ -124,9 +103,9 @@
ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-diff -urN ccpnmr.orig/ccpnmr1.0/c/ccpnmr/analysis/Makefile
ccpnmr/ccpnmr1.0/c/ccpnmr/analysis/Makefile
---- ccpnmr.orig/ccpnmr1.0/c/ccpnmr/analysis/Makefile 2006-01-13
21:52:45.000000000 +0000
-+++ ccpnmr/ccpnmr1.0/c/ccpnmr/analysis/Makefile 2006-01-13
21:57:29.000000000 +0000
+diff -urN ccpnmr.orig/ccpnmr2.0/c/ccpnmr/analysis/Makefile
ccpnmr/ccpnmr1.0/c/ccpnmr/analysis/Makefile
+--- ccpnmr.orig/ccpnmr2.0/c/ccpnmr/analysis/Makefile 2006-01-13
21:52:45.000000000 +0000
++++ ccpnmr/ccpnmr2.0/c/ccpnmr/analysis/Makefile 2006-01-13
21:57:29.000000000 +0000
@@ -40,11 +40,11 @@
$(GLOBAL_DIR)/py_ps_handler.o \
$(GLOBAL_DIR)/py_tk_handler.o
@@ -142,9 +121,9 @@
ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-diff -urN ccpnmr.orig/ccpnmr1.0/c/memops/global/Makefile
ccpnmr/ccpnmr1.0/c/memops/global/Makefile
---- ccpnmr.orig/ccpnmr1.0/c/memops/global/Makefile 2006-01-13
20:57:07.000000000 +0000
-+++ ccpnmr/ccpnmr1.0/c/memops/global/Makefile 2006-01-13 20:59:57.000000000
+0000
+diff -urN ccpnmr.orig/ccpnmr2.0/c/memops/global/Makefile
ccpnmr/ccpnmr1.0/c/memops/global/Makefile
+--- ccpnmr.orig/ccpnmr2.0/c/memops/global/Makefile 2006-01-13
20:57:07.000000000 +0000
++++ ccpnmr/ccpnmr2.0/c/memops/global/Makefile 2006-01-13 20:59:57.000000000
+0000
@@ -99,10 +99,10 @@
TCLTK_LIB = $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
@@ -173,7 +152,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-...@prefix@/bin/python2.5 -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/format/gui/DataShifter.py
+...@prefix@/bin/python2.5 -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/format/gui/DataShifter.py
diff -urN ccpnmr.orig/bin/updateAll ccpnmr/bin/updateAll
--- ccpnmr.orig/bin/updateAll 1970-01-01 01:00:00.000000000 +0100
+++ ccpnmr/bin/updateAll 2008-03-24 19:04:31.000000000 +0000
@@ -186,7 +165,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-...@prefix@/bin/python2.5 -i -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/update/UpdateAuto.py
+...@prefix@/bin/python2.5 -i -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/update/UpdateAuto.py
diff -urN ccpnmr.orig/bin/updateCheck ccpnmr/bin/updateCheck
--- ccpnmr.orig/bin/updateCheck 1970-01-01 01:00:00.000000000 +0100
+++ ccpnmr/bin/updateCheck 2008-03-24 19:06:16.000000000 +0000
@@ -199,4 +178,4 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-...@prefix@/bin/python2.5 -i -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/update/UpdatePopup.py
+...@prefix@/bin/python2.5 -i -O
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/update/UpdatePopup.py
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
