Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv10415/main/finkinfo/sci

Modified Files:
      Tag: pangocairo-branch
        emboss.info sparky-py.info sparky-py.patch 
Added Files:
      Tag: pangocairo-branch
        zhu3d.info 
Log Message:
merge from HEAD

Index: sparky-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/sparky-py.info,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- sparky-py.info      19 Jul 2007 22:23:33 -0000      1.5.2.2
+++ sparky-py.info      24 Jul 2007 17:36:45 -0000      1.5.2.3
@@ -1,12 +1,12 @@
 Info2: <<
 Package: sparky-py%type_pkg[python]
-Version: 3.113
+Version: 3.114
 Revision: 1000
 GCC: 4.0
 Maintainer: Jack Howarth <[EMAIL PROTECTED]>
 Type: python (2.3 2.4 2.5)
 Source: http://www.cgl.ucsf.edu/home/sparky/distrib-%v/sparky-source-%v.tar.gz
-Source-MD5: f3491553b1d00d56eb43cec9f9fa290b
+Source-MD5: 8a26112637acc8cc3f28aadcbf87a892
 SourceDirectory: sparky
 Depends: python%type_pkg[python], tcltk, x11
 BuildDepends: python%type_pkg[python], tcltk-dev, x11-dev

--- NEW FILE: zhu3d.info ---
Package: zhu3d
Version: 2.9.8
Revision: 1003
Source: http://www.kde-apps.org/CONTENT/content-files/43071-%n-%v.tar.gz
Depends: glib2-shlibs, libgettext3-shlibs, qt4-x11-core-shlibs, 
qt4-x11-gui-shlibs, libiconv, libpng3-shlibs, x11, x11-shlibs
BuildDepends: glib2-dev, libgettext3-dev, libiconv-dev, libpng3, x11-dev, 
qt4-x11
Maintainer: Jack Fink <[EMAIL PROTECTED]>
Homepage: http://kde-apps.org/content/show.php/Zhu3D?content=43071
License: GPL
Description: Functions viewer/animator, uses OpenGL
GCC: 4.0
Source-MD5: 7c7fc321b13d856b1616d7f33d206028
SourceDirectory: %n-%v
PatchScript: <<
        %p/lib/qt4-x11/bin/qmake zhu3d.pro
        perl -pi -e "s/-prebind/-undefined dynamic_lookup/" Makefile
<<
CompileScript: <<
        make
<<
InstallScript: <<
        mkdir -p %i/bin %i/share/%n/doc %i/share/%n/examples
        cp -p zhu3d %i/bin/
        cp -r doc/* %i/share/%n/doc/
        cp -r work/* %i/share/%n/examples/
        cp -r syste* %i/share/%n/
<<
DocFiles: license.gpl:COPYING readme.txt:README

Index: emboss.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/emboss.info,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- emboss.info 11 Apr 2007 15:25:00 -0000      1.7.2.2
+++ emboss.info 24 Jul 2007 17:36:45 -0000      1.7.2.3
@@ -1,16 +1,16 @@
 Package: emboss
-Version: 4.1.0
-Revision: 4
-Depends: %N-ajax4-shlibs (>= %v-%r), %N-nucleus4-shlibs (>= %v-%r), 
%N-plplot5-shlibs (>= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, 
system-java14
+Version: 5.0.0
+Revision: 1
+Depends: %N-ajax5-shlibs (>= %v-%r), %N-nucleus5-shlibs (>= %v-%r), 
%N-plplot5-shlibs (>= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, 
system-java14
 BuildDepends: libpng3, libjpeg, gd2, libiconv-dev, x11-dev, system-java14-dev
 #Replaces: emboss (<< 2.7.1-2)
 Source: mirror:custom:EMBOSS-%v.tar.gz
 CustomMirror: <<
   Primary: ftp://emboss.open-bio.org/pub/EMBOSS/
 <<
-Source-MD5: a08ed3834eb249162196df7ab889fd4c
+Source-MD5: be4c895220ad34afd65d450ba7d8e34b
 SetCPPFLAGS: -Dstat64=stat
-Patch: %n.patch
+#Patch: %n.patch
 PatchScript: <<
   perl -pi -e 's,([<"])(pcre)(.*.h[>"]),\1EMBOSS/\2\3,' ajax/*
   perl -pi -e 's,(pcre\S*\.h),EMBOSS/\1,g' ajax/Makefile.in
@@ -27,21 +27,21 @@
 <<
 
 SplitOff10: <<
-  Package: %N-ajax4-shlibs
+  Package: %N-ajax5-shlibs
   Depends: %N-plplot5-shlibs (>= %v-%r), libpng3-shlibs, libjpeg-shlibs, 
gd2-shlibs, libiconv
   DocFiles: ChangeLog COPYING README
   Files: <<
-    lib/EMBOSS/libajax.4*.dylib
-    lib/EMBOSS/libajaxg.4*.dylib
+    lib/EMBOSS/libajax.5*.dylib
+    lib/EMBOSS/libajaxg.5*.dylib
   <<
   Shlibs: <<
-    %p/lib/EMBOSS/libajax.4.dylib 5.0.0 %n (>= 4.0.0-1)
-    %p/lib/EMBOSS/libajaxg.4.dylib 5.0.0 %n (>= 4.0.0-1)
+    %p/lib/EMBOSS/libajax.5.dylib 5.0.0 %n (>= 5.0.0-1)
+    %p/lib/EMBOSS/libajaxg.5.dylib 5.0.0 %n (>= 5.0.0-1)
   <<
 <<
 SplitOff11: <<
-  Package: %N-ajax4-dev
-  Depends: %N-ajax4-shlibs (= %v-%r)
+  Package: %N-ajax5-dev
+  Depends: %N-ajax5-shlibs (= %v-%r)
   Conflicts: %N-dev
   Replaces: %N-dev
   DocFiles: ChangeLog COPYING README
@@ -55,22 +55,22 @@
 <<
 
 SplitOff20: <<
-  Package: %N-nucleus4-shlibs
-  Depends: %N-ajax4-shlibs (>= %v-%r)
-  Replaces: %N (<< 4.0.0-1)
+  Package: %N-nucleus5-shlibs
+  Depends: %N-ajax5-shlibs (>= %v-%r)
+  Replaces: %N (<< 5.0.0-1)
   DocFiles: ChangeLog COPYING README
   Files: <<
-    lib/EMBOSS/libnucleus.4*.dylib
+    lib/EMBOSS/libnucleus.5*.dylib
   <<
   Shlibs: <<
-    %p/lib/EMBOSS/libnucleus.4.dylib 5.0.0 %n (>= 4.0.0-1)
+    %p/lib/EMBOSS/libnucleus.5.dylib 5.0.0 %n (>= 5.0.0-1)
   <<
 <<
 SplitOff21: <<
-  Package: %N-nucleus4-dev
-  Depends: %N-nucleus4-shlibs (= %v-%r)
+  Package: %N-nucleus5-dev
+  Depends: %N-nucleus5-shlibs (= %v-%r)
   Conflicts: %N-dev
-  Replaces: %N-dev, %N (<< 4.0.0-1)
+  Replaces: %N-dev, %N (<< 5.0.0-1)
   DocFiles: ChangeLog COPYING README
   Files: <<
     lib/libnucleus*
@@ -83,28 +83,25 @@
 SplitOff30: <<
   Package: %N-plplot5-shlibs
   Depends: libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, libiconv, x11
-  Replaces: %N (<< 4.0.0-1)
+  Replaces: %N (<< 5.0.0-1)
   DocFiles: ChangeLog COPYING README
   Files: <<
-    lib/EMBOSS/libplplot.5*.dylib
+    lib/EMBOSS/libeplplot.3*.dylib
   <<
   Shlibs: <<
-    %p/lib/EMBOSS/libplplot.5.dylib 6.0.0 %n (>= 3.0.0-4)
+    %p/lib/EMBOSS/libeplplot.3.dylib 6.0.0 %n (>= 3.0.0-4)
   <<
 <<
 SplitOff31: <<
   Package: %N-plplot5-dev
   Depends: %N-plplot5-shlibs (= %v-%r)
   Conflicts: %N-dev
-  Replaces: %N-dev, %N (<< 4.0.0-1)
+  Replaces: %N-dev, %N (<< 5.0.0-1)
   DocFiles: ChangeLog COPYING README
   Files: <<
-    lib/libplplot*
-    lib/EMBOSS/libplplot*
-    include/EMBOSS/drivers.h
-    include/EMBOSS/metadefs.h
-    include/EMBOSS/pdf.h
-    include/EMBOSS/pl*.h
+    lib/libeplplot*
+    lib/EMBOSS/libeplplot*
+    include/eplplot/*.h
   <<
   BuildDependsOnly: True
 <<
@@ -115,7 +112,7 @@
 <<
 
 DocFiles: <<
-  AUTHORS ChangeLog COMPAT COPYING FAQ KNOWN_BUGS LICENSE NEWS README THANKS
+  AUTHORS ChangeLog COMPAT COPYING FAQ INSTALL KNOWN_BUGS LICENSE NEWS ONEWS 
PROBLEMS README THANKS
 <<
 Description: Molecular Biology Open Software Suite
 DescDetail: <<

Index: sparky-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/sparky-py.patch,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- sparky-py.patch     19 Jul 2007 22:23:33 -0000      1.4.2.1
+++ sparky-py.patch     24 Jul 2007 17:36:45 -0000      1.4.2.2
@@ -18,7 +18,7 @@
                  bruk2ucsf$(EXE_SUFFIX) peaks2ucsf$(EXE_SUFFIX) \
                  matrix2ucsf$(EXE_SUFFIX)
  
--PYTHON_VERSION        = 2.4
+-PYTHON_VERSION        = 2.5
 +PYTHON_VERSION        = 2.X
  PYTHON_DIR    = 
  
@@ -63,21 +63,21 @@
  # If Python is available start Sparky as a Python extension.
  # Otherwise the standalone version of Sparky is started.
  #
--set PYTHON = $SPARKY_INSTALL/python2.4/bin/python2.4
-+set PYTHON = @FINKPREFIX@/bin/python2.X
- if (! -e $PYTHON) then
--  set PYTHON = python2.4
+-set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5"
++set PYTHON = "@FINKPREFIX@/bin/python2.X"
+ if (! -e "$PYTHON") then
+-  set PYTHON = python2.5
 +  set PYTHON = python2.X
  endif
  
  # 
-----------------------------------------------------------------------------
  # Where to find Tcl/Tk shared libraries and resources.
  #
--setenv TCLTK_LIB              $SPARKY_INSTALL/lib
-+setenv TCLTK_LIB              @FINKPREFIX@/lib
- setenv LD_LIBRARY_PATH                $TCLTK_LIB
- setenv LD_LIBRARYN32_PATH     $TCLTK_LIB
- setenv DYLD_LIBRARY_PATH      $TCLTK_LIB
+-setenv TCLTK_LIB              "$SPARKY_INSTALL/lib"
++setenv TCLTK_LIB              "@FINKPREFIX@/lib"
+ setenv LD_LIBRARY_PATH                "$TCLTK_LIB"
+ setenv LD_LIBRARYN32_PATH     "$TCLTK_LIB"
+ setenv DYLD_LIBRARY_PATH      "$TCLTK_LIB"
 diff -uNr sparky/c++/Makefile sparky.fink/c++/Makefile
 --- sparky/c++/Makefile        2004-02-03 18:56:24.000000000 -0500
 +++ sparky.fink/c++/Makefile   2005-12-14 19:40:06.000000000 -0500
@@ -88,8 +88,8 @@
 -SPARKY                = /usr/local/src/sparky
 +SPARKY                = @BUILDDIR@
  SPARKY_SRC    = $(SPARKY)/c++
--PYTHON_VERSION        = 2.4
--PY_VER_WIN32  = 24
+-PYTHON_VERSION        = 2.5
+-PY_VER_WIN32  = 25
 -PYTHON_PREFIX = /usr/local
 +SPARKY_INSTALL = @FINKDESTDIR@@FINKPREFIX@/lib/sparky-py2X
 +PYTHON_VERSION        = 2.X
@@ -186,7 +186,7 @@
  
 -SPARKY_INSTALL        = /usr/local/sparky
 -PYTHON_PREFIX = /usr/local
--PYTHON_VERSION        = 2.4
+-PYTHON_VERSION        = 2.5
 +SPARKY_INSTALL        = @FINKDESTDIR@@FINKPREFIX@/lib/sparky-py2X
 +PYTHON_PREFIX = @FINKPREFIX@
 +PYTHON_VERSION        = 2.X


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to