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

Modified Files:
      Tag: pangocairo-branch
        biggles-py.info emboss.info emboss.patch geda-gattrib.info 
        gildas.info lpsolve-octave.info octave.info octave.patch 
        pyfits-py.info qprop.info scientificpython-py.info 
        scientificpython-py.patch scipy-py.info scipy-py.patch 
        yorick.info zimpl.info 
Log Message:
mege from head

Index: scipy-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-py.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- scipy-py.patch      18 Sep 2007 00:27:40 -0000      1.1.2.3
+++ scipy-py.patch      28 Sep 2007 16:34:31 -0000      1.1.2.4
@@ -1,6 +1,20 @@
---- scipy/Lib/sandbox/setup.py.orig    2006-09-08 10:34:46.000000000 -0600
-+++ scipy/Lib/sandbox/setup.py 2006-09-08 10:36:48.000000000 -0600
-@@ -47,40 +47,40 @@
+--- scipy/scipy/sandbox/setup.py.orig  2007-09-22 07:45:51.000000000 -0600
++++ scipy/scipy/sandbox/setup.py       2007-09-22 07:45:57.000000000 -0600
+@@ -34,58 +34,58 @@
+     # check it in and screw other people up :-)
+ 
+     # An example package:
+-    #config.add_subpackage('exmplpackage')
++    config.add_subpackage('exmplpackage')
+ 
+     # Monte Carlo package
+     #config.add_subpackage('montecarlo')
+ 
+     # Robert Kern's corner:
+-    #config.add_subpackage('rkern')
++    config.add_subpackage('rkern')
+ 
+     # ODRPACK
      #config.add_subpackage('odr')
  
      # Delaunay triangulation and Natural Neighbor interpolation
@@ -17,11 +31,11 @@
  
      # Statistical models
 -    #config.add_subpackage('models')
-+    #config.add_subpackage('models')
++    config.add_subpackage('models')
  
      # Adaptation of Scientific.IO (2.4.9) to use NumPy
 -    #config.add_subpackage('netcdf')
-+    config.add_subpackage('netcdf')
++    #config.add_subpackage('netcdf')
  
      # Finite Difference Formulae package
 -    #config.add_subpackage('fdfpack')
@@ -33,7 +47,7 @@
  
      # Interpolating between sparse samples
 -    #config.add_subpackage('buildgrid')
-+    #config.add_subpackage('buildgrid')
++    config.add_subpackage('buildgrid')
  
      # Package for Support Vector Machine 
 -    #config.add_subpackage('svm')
@@ -45,30 +59,19 @@
  
      # David Cournapeau's corner: autocorrelation, lpc, lpc residual
 -    #config.add_subpackage('cdavid')
-+    #config.add_subpackage('cdavid')
++    config.add_subpackage('cdavid')
  
      # New spline package (based on scipy.interpolate)
 -    #config.add_subpackage('spline')
 +    config.add_subpackage('spline')
+     
+     # Radial basis functions package
+-    #config.add_subpackage('rbf')
++    config.add_subpackage('rbf')
  
-     return config
+     # Multigrid Solvers
+-    #config.add_subpackage('multigrid')
++    config.add_subpackage('multigrid')
  
---- scipy/Lib/fftpack/setup.py.old     2007-08-23 14:40:09.000000000 -0400
-+++ scipy/Lib/fftpack/setup.py 2007-08-23 14:40:36.000000000 -0400
-@@ -30,7 +30,7 @@
-     config.add_extension('_fftpack',
-                          sources=sources,
-                          libraries=['dfftpack'],
--                         extra_info = fft_opt_info
-+                         extra_info = [fft_opt_info, djbfft_info],
-                          )
  
-     config.add_extension('convolve',
---- scipy/Lib/signal/filter_design.py.old      2007-08-20 22:43:50.000000000 
-0400
-+++ scipy/Lib/signal/filter_design.py  2007-08-23 15:10:19.000000000 -0400
-@@ -1539,4 +1539,4 @@
-     alpha = N//2
-     m = numpy.arange(0,N)
-     h = win*special.sinc(cutoff*(m-alpha))
--    return h / sum(h,axis=0)
-+    return h / numpy.sum(h,axis=0)
+     return config

Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- gildas.info 4 Aug 2007 03:33:12 -0000       1.1.2.2
+++ gildas.info 28 Sep 2007 16:34:30 -0000      1.1.2.3
@@ -1,11 +1,11 @@
 Package: gildas
-Version: 200707
+Version: 200709
 Revision: 1
 Description: Radioastronomy data analysis software
 License: OSI-Approved
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-jul07a.tar.gz
-Source-MD5: d98f4f6c0a8596b73852268f54946bfd
+Source: http://www.iram.fr/~gildas/dist/gildas-src-sep07a.tar.gz
+Source-MD5: 1d6a272d5dc633a32f031f2b0df01bad
 Depends: <<
   fftw3-shlibs, libpng3-shlibs, openmotif3-shlibs, x11
 <<

Index: scientificpython-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- scientificpython-py.patch   20 Jan 2006 20:30:40 -0000      1.1
+++ scientificpython-py.patch   28 Sep 2007 16:34:31 -0000      1.1.2.1
@@ -1,20 +1,20 @@
---- ScientificPython/setup.py.orig     Sat Feb 21 16:47:37 2004
-+++ ScientificPython/setup.py  Sat Feb 21 16:48:34 2004
-@@ -32,7 +32,7 @@
-                              ['Src/Scientific_netcdf.c'],
-                              include_dirs=['Include', netcdf_include],
+--- ScientificPython/setup.py.orig     2007-09-22 07:31:15.000000000 -0600
++++ ScientificPython/setup.py  2007-09-22 07:32:39.000000000 -0600
+@@ -61,7 +61,7 @@
+                              include_dirs=['Include', netcdf_include]
+                                           + arrayobject_h_include,
                               library_dirs=[netcdf_lib],
--                             libraries = ['netcdf'])]
-+                             libraries = ['nc-dap','dap'])]
- 
- packages = ['Scientific', 'Scientific.Functions',
-             'Scientific.Geometry', 'Scientific.IO',
---- ScientificPython/Src/Scientific_netcdf.c.orig      Fri Sep 16 13:08:17 2005
-+++ ScientificPython/Src/Scientific_netcdf.c   Fri Sep 16 13:08:54 2005
-@@ -11,7 +11,7 @@
+-                             libraries = ['netcdf'],
++                             libraries = ['nc-dap','dap'],
+                              extra_compile_args=extra_compile_args)]
  
- #include "Python.h"
+ cmdclass = {}
+--- ScientificPython/Src/Scientific_netcdf.c.orig      2007-09-22 
07:33:10.000000000 -0600
++++ ScientificPython/Src/Scientific_netcdf.c   2007-09-22 07:33:23.000000000 
-0600
+@@ -19,7 +19,7 @@
  #include "Numeric/arrayobject.h"
+ #endif
+ #endif
 -#include "netcdf.h"
 +#include "libnc-dap/netcdf.h"
  

Index: yorick.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/yorick.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- yorick.info 20 Jan 2006 20:30:41 -0000      1.1
+++ yorick.info 28 Sep 2007 16:34:31 -0000      1.1.2.1
@@ -1,5 +1,5 @@
 Package: yorick
-Version: 2.1.01
+Version: 2.1.04
 Revision: 1
 Description: Interpreted language and scientific graphics
 License: BSD
@@ -11,7 +11,7 @@
 Replaces: yorick
 Source: mirror:sourceforge:yorick/yorick-%v.tgz
 SourceDirectory: yorick-2.1
-Source-MD5: 9d9e2a223bc03b420ccc4a00b5a7fc90
+Source-MD5: fb434855c707993fac932188ca518589
 SetCFLAGS: -O2
 CompileScript: <<
   make Y_HOME=relocatable ysite

Index: scientificpython-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.info,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- scientificpython-py.info    19 Jun 2007 21:17:54 -0000      1.6.2.1
+++ scientificpython-py.info    28 Sep 2007 16:34:31 -0000      1.6.2.2
@@ -1,22 +1,22 @@
 Info2: <<
 
 Package: scientificpython-py%type_pkg[python]
-Version: 2.4.11
+Version: 2.7.6
 Revision: 2
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python (2.3 2.4 2.5)
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python], numeric-py%type_pkg[python], 
libnc-dap3-shlibs (>= 3.5.2-1001), libdap3-shlibs (>= 3.5.2-1001)
-BuildDepends: libnc-dap3 (>= 3.5.2-1001), libdap3 (>= 3.5.2-1001)
+Depends: python%type_pkg[python], scipy-core-py%type_pkg[python], 
libnc-dap3-shlibs (>= 3.5.2-1001), libdap6-shlibs
+BuildDepends: libnc-dap3 (>= 3.7.0-1), libdap6
 Replaces: scientificpython
-Source: http://sourcesup.cru.fr/frs/download.php/686/scientificpython-%v.tar.gz
-Source-MD5: 387878545731da56e5a798de04588439
+Source: 
http://sourcesup.cru.fr/frs/download.php/1392/scientificpython-%v.tar.gz
+Source-MD5: 1e118671f45b0d19927b792fe56c07e8
 SourceDirectory:  ScientificPython-%v
 Patch: %{ni}.patch
 CompileScript: <<
  #!/bin/sh -ev
  export NETCDF_PREFIX=%p
- %p/bin/python%type_raw[python] setup.py build 
+ %p/bin/python%type_raw[python] setup.py build --numpy
 <<
 InstallScript: <<
  #!/bin/sh -ev
@@ -25,21 +25,22 @@
  mkdir -p %i/share/doc/%n/HTML
  mkdir -p %i/share/doc/%n/PDF
  mv %i/bin/bsp_virtual %i/bin/bsp_virtual%type_raw[python]
+ mv %i/bin/task_manager %i/bin/task_manager%type_raw[python]
  ln -s %p/bin/bsp_virtual%type_raw[python] %i/bin/bsp_virtual
+ ln -s %p/bin/task_manager%type_raw[python] %i/bin/task_manager
  cp -R Examples %i/share/doc/%n
- cp -R Doc/HTML %i/share/doc/%n
- cp -R Doc/PDF  %i/share/doc/%n
+ cp -R Doc/* %i/share/doc/%n
 <<
 SplitOff: <<
   Package: scientificpython-py%type_pkg[python]-bin
   Conflicts: scientificpython-py22-bin, scientificpython-py23-bin, 
scientificpython-py24-bin
   Replaces: scientificpython-py22-bin, scientificpython-py23-bin, 
scientificpython-py24-bin
   Depends: scientificpython-py%type_pkg[python] (= %v-%r)
-  Files: bin/bsp_virtual
+  Files: bin/bsp_virtual bin/task_manager
   DocFiles: README LICENSE
 <<
 License: OSI-Approved
-DocFiles: README LICENSE
+DocFiles: README LICENSE 
 Description: Python modules for scientific computing
 DescDetail: <<
 In this collection you will find modules that

Index: zimpl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/zimpl.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- zimpl.info  27 Sep 2006 00:29:19 -0000      1.2
+++ zimpl.info  28 Sep 2007 16:34:31 -0000      1.2.2.1
@@ -1,5 +1,5 @@
 Package: zimpl
-Version: 2.05
+Version: 2.07
 Revision: 1
 Description: Modeling language for optimization problems
 License: GPL
@@ -10,15 +10,14 @@
 Depends: gmp-shlibs (>= 4.1.2)
 
 # Unpack Phase:
-Source: http://www.zib.de/koch/zimpl/download/%n-%v.tgz
-Source-MD5: 20cef862b75e567412b34b6dc484d8c0
-SourceDirectory: %n
+Source: http://zimpl.zib.de/download/%n-%v.tgz
+Source-MD5: bfc602cd0e9d8d2365457b3933f49ef1
+#SourceDirectory: %n
 
 # Patch Phase
 PatchScript: <<
   echo "CPPFLAGS += -I%p/include" > make/local/make.`hostname`
   echo "LDFLAGS  += -L%p/lib" >> make/local/make.`hostname`
-  ln -s make.darwin.ppc.gnu.opt make/make.darwin.x86.gnu.opt
 <<
 
 # Compile Phase:

Index: geda-gattrib.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gattrib.info,v
retrieving revision 1.8.2.25
retrieving revision 1.8.2.26
diff -u -d -r1.8.2.25 -r1.8.2.26
--- geda-gattrib.info   28 Sep 2007 16:15:26 -0000      1.8.2.25
+++ geda-gattrib.info   28 Sep 2007 16:34:30 -0000      1.8.2.26
@@ -74,8 +74,11 @@
        ./configure %c
        make
 <<
-
-InstallScript: make -j1 install DESTDIR=%d
+InstallScript: <<
+    make -j1 install DESTDIR=%d
+    mkdir -p %d/%p/share/gEDA
+    mv %d/%p/etc/gEDA/gattrib-menus.xml %d/%p/share/gEDA
+<<
 
 DocFiles: <<
   AUTHORS BUGS COPYING ChangeLog NEWS NOTES README ToDos
@@ -107,7 +110,7 @@
 <<
 
 DescPackaging: <<
-$LastChangedRevision: 423 $ in my local SVN repository.
+$LastChangedRevision: 428 $ in my local SVN repository.
 <<
 
 License: GPL

Index: biggles-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/biggles-py.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- biggles-py.info     19 Jun 2007 21:17:51 -0000      1.4.2.1
+++ biggles-py.info     28 Sep 2007 16:34:30 -0000      1.4.2.2
@@ -1,14 +1,14 @@
 Info2: <<
 Package: biggles-py%type_pkg[python]
-Version: 1.6.4
-Revision: 1002
+Version: 1.6.5
+Revision: 1001
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python(2.3 2.4 2.5)
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
 BuildDepends: plotutils-dev (>= 2.4.1-1007)
-Depends: python%type_pkg[python], numeric-py%type_pkg[python], 
plotutils-shlibs (>= 2.4.1-1007)
+Depends: python%type_pkg[python], numpy-py%type_pkg[python], plotutils-shlibs 
(>= 2.4.1-1007)
 Source: mirror:sourceforge:biggles/python2-biggles-%v.tar.gz
-Source-MD5: e07bc9e22d830ada274ea71bc6d12556
+Source-MD5: be1ba7a98cd58ce875e181bd60930b63
 CompileScript: python%type_raw[python] setup.py build   
 InstallScript: <<
   python%type_raw[python] setup.py install --root=%d

Index: octave.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.patch,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- octave.patch        29 May 2007 20:21:43 -0000      1.4.2.2
+++ octave.patch        28 Sep 2007 16:34:30 -0000      1.4.2.3
@@ -1,6 +1,6 @@
---- octave/configure.orig      2006-12-22 07:35:54.000000000 -0700
-+++ octave/configure   2006-12-22 07:36:59.000000000 -0700
-@@ -12693,16 +12693,13 @@
+--- octave/configure.orig      2007-09-23 13:52:42.000000000 -0600
++++ octave/configure   2007-09-23 13:53:32.000000000 -0600
+@@ -12961,16 +12961,13 @@
        LIBS="$save_LIBS"
  fi
  
@@ -23,7 +23,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12715,7 +12712,7 @@
+@@ -12983,7 +12980,7 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -32,7 +32,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -12727,7 +12724,7 @@
+@@ -12995,7 +12992,7 @@
  int
  main ()
  {
@@ -41,7 +41,7 @@
    ;
    return 0;
  }
-@@ -12750,29 +12747,31 @@
+@@ -13018,29 +13015,31 @@
         test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -83,7 +83,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12837,13 +12836,14 @@
+@@ -13105,13 +13104,14 @@
               { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -102,7 +102,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12857,7 +12857,7 @@
+@@ -13125,7 +13125,7 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -111,7 +111,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -12869,7 +12869,7 @@
+@@ -13137,7 +13137,7 @@
  int
  main ()
  {
@@ -120,7 +120,7 @@
    ;
    return 0;
  }
-@@ -12892,38 +12892,31 @@
+@@ -13160,38 +13160,31 @@
         test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -174,7 +174,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12971,31 +12964,40 @@
+@@ -13239,31 +13232,40 @@
         test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -226,7 +226,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13009,7 +13011,7 @@
+@@ -13277,7 +13279,7 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -235,7 +235,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13021,7 +13023,7 @@
+@@ -13289,7 +13291,7 @@
  int
  main ()
  {
@@ -244,7 +244,7 @@
    ;
    return 0;
  }
-@@ -13044,30 +13046,29 @@
+@@ -13312,30 +13314,29 @@
         test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -284,7 +284,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13081,7 +13082,7 @@
+@@ -13349,7 +13350,7 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -293,7 +293,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13093,7 +13094,7 @@
+@@ -13361,7 +13362,7 @@
  int
  main ()
  {
@@ -302,7 +302,7 @@
    ;
    return 0;
  }
-@@ -13132,14 +13133,13 @@
+@@ -13400,14 +13401,13 @@
               { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -321,7 +321,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13153,7 +13153,7 @@
+@@ -13421,7 +13421,7 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -330,7 +330,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13165,7 +13165,7 @@
+@@ -13433,7 +13433,7 @@
  int
  main ()
  {
@@ -339,7 +339,7 @@
    ;
    return 0;
  }
-@@ -13188,23 +13188,23 @@
+@@ -13456,23 +13456,23 @@
         test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -370,3 +370,11 @@
  fi
  
  fi
+@@ -13481,6 +13481,7 @@
+ 
+ fi
+ 
++
+ # BLAS in Alpha CXML library?
+ if test $acx_blas_ok = no; then
+       as_ac_Lib=`echo "ac_cv_lib_cxml_$sgemm" | $as_tr_sh`

Index: scipy-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-py.info,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -d -r1.11.2.3 -r1.11.2.4
--- scipy-py.info       18 Sep 2007 00:27:40 -0000      1.11.2.3
+++ scipy-py.info       28 Sep 2007 16:34:31 -0000      1.11.2.4
@@ -1,16 +1,16 @@
 Info2: <<
 
 Package: scipy-py%type_pkg[python]
-Version: 0.5.2.1
+Version: 0.6.0
 Epoch: 1
 Revision: 2
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
 Type: python (2.3 2.4 2.5)
-Depends: scipy-core-py%type_pkg[python] (>= 1.0.3-1), python%type_pkg[python] 
| python%type_pkg[python]-nox, fftw3-shlibs, netcdf-shlibs
-BuildDepends: fftw3, g95 (>= 0.90-1), netcdf, djbfft (>= 0.76-3)
+Depends: scipy-core-py%type_pkg[python] (>= 1.0.3-1), python%type_pkg[python] 
| python%type_pkg[python]-nox, fftw3-shlibs
+BuildDepends: fftw3, g95 (>= 0.90-1), djbfft (>= 0.76-3)
 Source: mirror:sourceforge:scipy/scipy-%v.tar.gz
-Source-MD5: 8d9083b94b0bbbc96a96099f68e62526
+Source-MD5: 417adf3bfe03f4c23c9fb265018e545c
 Patch: %{ni}.patch
 CompileScript: <<
  %p/bin/python%type_raw[python] setup.py config_fc --fcompiler=g95 build

Index: octave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.info,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -d -r1.13.2.5 -r1.13.2.6
--- octave.info 18 Sep 2007 00:27:39 -0000      1.13.2.5
+++ octave.info 28 Sep 2007 16:34:30 -0000      1.13.2.6
@@ -1,10 +1,10 @@
 Package: octave
-Version: 2.9.13
+Version: 2.9.14
 Revision: 1
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
 BuildDependsOnly: false
 Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%v.tar.gz
-Source-MD5: 493e9dfc66bfda1ea270bf1dfc8ec6cc
+Source-MD5: b3253a5e21f114a96183b4fef31a5a41
 BuildDepends: glpk-dev, hdf5, readline5, texinfo, g95 (>= 0.50-20060321), 
libncurses5, fftw3, texi2html, tetex-base, libcurl4, sed, pcre
 Depends: glpk-shlibs, gnuplot | gnuplot-nox, readline5-shlibs, fftw3-shlibs, 
hdf5-shlibs, ncurses, libncurses5-shlibs, aquaterm, libcurl4-shlibs, pcre-shlibs
 BuildConflicts: coot-dev, broken-gcc, lammpi-dev

Index: pyfits-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pyfits-py.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- pyfits-py.info      19 Jun 2007 21:17:53 -0000      1.2.2.1
+++ pyfits-py.info      28 Sep 2007 16:34:30 -0000      1.2.2.2
@@ -1,6 +1,6 @@
 Info2: <<
 Package: pyfits-py%type_pkg[python]
-Version: 1.0.1
+Version: 1.1
 Revision: 1
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python(2.3 2.4 2.5)
@@ -9,10 +9,11 @@
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
 Depends: <<
   python%type_pkg[python] | python%type_pkg[python]-nox, 
-  numeric-py%type_pkg[python]
+  numpy-py%type_pkg[python]
 <<
-Source: ftp://ra.stsci.edu/pub/pyfits/pyfits-%v.tar.gz
-Source-MD5: 7cab1ef229b47760f91437b427e43819
+Source: 
http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-%v.tar.gz
+Source-MD5: c609558432e2b61bc91cf511e8b62fd9
+SourceDirectory: pyfits
 CompileScript: <<
   python%type_raw[python] setup.py build
 <<

Index: emboss.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/emboss.patch,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- emboss.patch        11 Apr 2007 15:25:00 -0000      1.5.2.1
+++ emboss.patch        28 Sep 2007 16:34:30 -0000      1.5.2.2
@@ -1,24 +1,21 @@
-diff -Naur EMBOSS-4.1.0/ajax/ajjava.c EMBOSS-4.1.0-patched/ajax/ajjava.c
---- EMBOSS-4.1.0/ajax/ajjava.c 2006-06-20 05:12:35.000000000 -0400
-+++ EMBOSS-4.1.0-patched/ajax/ajjava.c 2007-04-06 12:09:04.000000000 -0400
-@@ -89,7 +89,7 @@
- #define _XOPEN_SOURCE
- #endif
- 
--#if !defined(__ppc__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <crypt.h>
- #endif
- 
-diff -Naur EMBOSS-4.1.0/emboss/jembossctl.c 
EMBOSS-4.1.0-patched/emboss/jembossctl.c
---- EMBOSS-4.1.0/emboss/jembossctl.c   2007-01-16 07:11:18.000000000 -0500
-+++ EMBOSS-4.1.0-patched/emboss/jembossctl.c   2007-04-06 12:09:29.000000000 
-0400
-@@ -115,7 +115,7 @@
- #define _XOPEN_SOURCE
- #endif
+--- EMBOSS-5.0.0/emboss/psiphi.c       2007-07-06 08:15:29.000000000 -0400
++++ EMBOSS-5.0.0-patch/emboss/psiphi.c 2007-07-27 05:28:27.000000000 -0400
+@@ -160,7 +160,7 @@
+     finishres = ajAcdGetInt("finishresiduenumber");
  
--#if !defined(__ppc__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <crypt.h>
- #endif
+     /* reserve memory for and read in structure */
+-    /* JISON */    pdb = ajPdbReadoldNew(pdbfile);
++    /* JISON */    pdb = ajPdbReadNew(pdbfile,0);
+     
+     /* check and set number of chain to be analysed */
+     highest = pdb->Nchn;
+@@ -440,6 +440,9 @@
+     ajint lowestres = 0;
  
+     AjPAtom inlist   = NULL;
++
++    if(!ajListGetLength(pdb->Chains[myindex]->Atoms))
++      ajFatal("Chain %d has no atoms",myindex+1);
+     
+     /* read first atom in list into memory, but keep it on list */
+     ajListPeek(pdb->Chains[myindex]->Atoms,

Index: emboss.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/emboss.info,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -d -r1.7.2.4 -r1.7.2.5
--- emboss.info 18 Sep 2007 00:27:38 -0000      1.7.2.4
+++ emboss.info 28 Sep 2007 16:34:30 -0000      1.7.2.5
@@ -1,6 +1,6 @@
 Package: emboss
 Version: 5.0.0
-Revision: 2
+Revision: 3
 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 (<< 5.0.0)
@@ -10,13 +10,7 @@
 <<
 Source-MD5: be4c895220ad34afd65d450ba7d8e34b
 SetCPPFLAGS: -Dstat64=stat
-#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
-  mkdir ajax/EMBOSS
-  mv ajax/pcre*.h ajax/EMBOSS
-<<
+Patch: %n.patch
 ConfigureParams: 
--with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home 
--with-javaos=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/include
 --disable-dependency-tracking --libdir=%p/lib/EMBOSS
 Installscript: <<
   make install DESTDIR=%d

Index: lpsolve-octave.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-octave.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- lpsolve-octave.info 13 Feb 2007 19:58:10 -0000      1.1.2.3
+++ lpsolve-octave.info 28 Sep 2007 16:34:30 -0000      1.1.2.4
@@ -1,9 +1,9 @@
 Info2: <<
 Package: lpsolve-octave
 Version: 5.5.0.10
-Revision: 1
+Revision: 2
 ## It is probably prudent to rev-up and change the next line whenever octave 
or lpsolve go to a new version
-Type: octave (2.1.73), maj (5.5)
+Type: octave (2.9.14), maj (5.5)
 
 BuildDepends: fftw3, hdf5, libncurses5, lpsolve%type_raw[maj]-dev (>= %v-1), 
octave (>= %type_raw[octave]-1), readline5
 Depends: fftw3-shlibs, hdf5-shlibs, libncurses5-shlibs, 
lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1), octave (>= 
%type_raw[octave]-1), readline5-shlibs

Index: qprop.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qprop.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- qprop.info  13 Feb 2007 19:58:11 -0000      1.2.2.2
+++ qprop.info  28 Sep 2007 16:34:31 -0000      1.2.2.3
@@ -1,12 +1,12 @@
 Package: qprop
-Version: 1.16
+Version: 1.21
 Revision: 1
 #Architecture: powerpc
 License: GPL
 Depends:
 BuildDepends: g95
 Source: http://web.mit.edu/drela/Public/web/qprop/qprop%v.tar.gz
-Source-MD5: 28219cc9b811e714c3b24c67b3936ff4
+Source-MD5: 1398ef8c670828138bdb4807037fe433
 SourceDirectory: Qprop
 PatchScript: patch -p1 < %a/%n.patch
 CompileScript: <<
@@ -26,7 +26,7 @@
   /bin/cp -pr * %i/share/doc/qprop/runs/
   head -n14 ../src/qprop.f | tail -n11 > %i/share/doc/qprop/License
 <<
-DocFiles: qprop_doc.txt qmil_doc.txt prop_measure.pdf qprop_theory.pdf 
version_notes.txt README
+DocFiles: qprop_doc.txt qmil_doc.txt version_notes.txt README
 Description: Propeller + motor performance analysis
 DescDetail: <<
   QPROP is an analysis program for predicting the performance 
@@ -42,11 +42,6 @@
   for the Minimum Induced Loss (MIL) condition.  It can also
   generated windmill geometries for the MIL or Maximum Total Power
   (MTP) conditions.  See the qmil_doc.txt document for more info.
-
-  User's manuals:  qprop_doc.txt  qmil_doc.txt
-  Theory document:  qprop_theory.pdf
-  
-  Prop measurement info sheet:  prop_measure.pdf
 <<
 DescPort: <<
   Compiles with double precision math.


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to