Menu
▾
▴
[cvs] dists/10.4/unstable/main/finkinfo/sci gildas.info, 1.41, 1.42 gildas.patch, 1.19, 1.20
|
From: Sebastien M. <bm...@us...> - 2010-08-30 14:51:00
|
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26248 Modified Files: gildas.info gildas.patch Log Message: New version. Index: gildas.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gildas.patch 21 May 2010 08:22:11 -0000 1.19 +++ gildas.patch 30 Aug 2010 14:50:46 -0000 1.20 @@ -1,6 +1,6 @@ -diff -ruN --exclude='*~' gildas-src-apr10a/admin/Makefile gildas-src-apr10a.patched/admin/Makefile ---- gildas-src-apr10a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100 -+++ gildas-src-apr10a.patched/admin/Makefile 2010-04-02 00:03:40.000000000 +0200 +diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile gildas-src-aug10a.patched/admin/Makefile +--- gildas-src-aug10a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100 ++++ gildas-src-aug10a.patched/admin/Makefile 2010-08-25 17:12:33.000000000 +0200 @@ -33,31 +33,31 @@ integ: integ-message @@ -55,9 +55,9 @@ +# @(echo) ########################################################################### -diff -ruN --exclude='*~' gildas-src-apr10a/admin/Makefile.build gildas-src-apr10a.patched/admin/Makefile.build ---- gildas-src-apr10a/admin/Makefile.build 2009-11-27 10:05:06.000000000 +0100 -+++ gildas-src-apr10a.patched/admin/Makefile.build 2010-04-02 00:03:40.000000000 +0200 +diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile.build gildas-src-aug10a.patched/admin/Makefile.build +--- gildas-src-aug10a/admin/Makefile.build 2009-11-27 10:05:06.000000000 +0100 ++++ gildas-src-aug10a.patched/admin/Makefile.build 2010-08-25 17:12:33.000000000 +0200 @@ -313,6 +313,10 @@ -lm: @@ -69,10 +69,10 @@ # Required by ASDM libs: -lstdc++: -diff -ruN --exclude='*~' gildas-src-apr10a/admin/Makefile.def gildas-src-apr10a.patched/admin/Makefile.def ---- gildas-src-apr10a/admin/Makefile.def 2010-03-11 18:37:04.000000000 +0100 -+++ gildas-src-apr10a.patched/admin/Makefile.def 2010-04-02 00:03:40.000000000 +0200 -@@ -565,7 +565,7 @@ +diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile.def gildas-src-aug10a.patched/admin/Makefile.def +--- gildas-src-aug10a/admin/Makefile.def 2010-07-13 09:46:23.000000000 +0200 ++++ gildas-src-aug10a.patched/admin/Makefile.def 2010-08-25 17:12:33.000000000 +0200 +@@ -567,7 +567,7 @@ ########################################################################### # Kernel libraries @@ -81,10 +81,10 @@ GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgmath -lgsys -lginc ifeq ($(GAG_USE_XML),yes) -diff -ruN --exclude='*~' gildas-src-apr10a/admin/define-system.sh gildas-src-apr10a.patched/admin/define-system.sh ---- gildas-src-apr10a/admin/define-system.sh 2010-02-11 15:26:15.000000000 +0100 -+++ gildas-src-apr10a.patched/admin/define-system.sh 2010-04-02 00:03:40.000000000 +0200 -@@ -208,12 +208,12 @@ +diff -ruN --exclude='*~' gildas-src-aug10a/admin/define-system.sh gildas-src-aug10a.patched/admin/define-system.sh +--- gildas-src-aug10a/admin/define-system.sh 2010-07-12 17:00:21.000000000 +0200 ++++ gildas-src-aug10a.patched/admin/define-system.sh 2010-08-25 17:12:33.000000000 +0200 +@@ -209,12 +209,12 @@ else GAG_MACHINE=pc fi @@ -103,10 +103,10 @@ fi ;; CYGWIN*) GAG_MACHINE=pc -diff -ruN --exclude='*~' gildas-src-apr10a/admin/gildas-env.sh gildas-src-apr10a.patched/admin/gildas-env.sh ---- gildas-src-apr10a/admin/gildas-env.sh 2010-03-17 19:07:03.000000000 +0100 -+++ gildas-src-apr10a.patched/admin/gildas-env.sh 2010-04-02 00:03:40.000000000 +0200 -@@ -449,20 +449,20 @@ +diff -ruN --exclude='*~' gildas-src-aug10a/admin/gildas-env.sh gildas-src-aug10a.patched/admin/gildas-env.sh +--- gildas-src-aug10a/admin/gildas-env.sh 2010-07-23 16:50:31.000000000 +0200 ++++ gildas-src-aug10a.patched/admin/gildas-env.sh 2010-08-25 17:14:27.000000000 +0200 +@@ -449,21 +449,21 @@ NUMPY_PRESENT=no NUMERIC_PRESENT=no SQLITE3_PRESENT=no @@ -114,26 +114,28 @@ + if \which python2.6 > /dev/null 2>&1; then # Check the version of python the user is currently using # (There may be a portability problem with the use of awk) -- if python -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null 2>&1; then -- PY_VERS=`python -V 2>&1 | awk '{printf "%.3s", $2}'` -+ if python2.6 -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null 2>&1; then -+ PY_VERS=`python2.6 -V 2>&1 | awk '{printf "%.3s", $2}'` - # - # Now search for Numpy or Numeric -- if python -c "import numpy" > /dev/null 2>&1; then -+ if python2.6 -c "import numpy" > /dev/null 2>&1; then - NUMPY_PRESENT=yes -- elif python -c "import Numeric"> /dev/null 2>&1; then -+ elif python2.6 -c "import Numeric"> /dev/null 2>&1; then - NUMERIC_PRESENT=yes - fi - # Search for sqlite3 -- if python -c "import sqlite3" > /dev/null 2>&1; then -+ if python2.6 -c "import sqlite3" > /dev/null 2>&1; then - SQLITE3_PRESENT=yes +- if python -V 2>&1 > /dev/null 2>&1; then +- if python -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null 2>&1; then +- PY_VERS=`python -V 2>&1 | awk '{printf "%.3s", $2}'` ++ if python2.6 -V 2>&1 > /dev/null 2>&1; then ++ if python2.6 -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null 2>&1; then ++ PY_VERS=`python2.6 -V 2>&1 | awk '{printf "%.3s", $2}'` + # + # Now search for Numpy or Numeric +- if python -c "import numpy" > /dev/null 2>&1; then ++ if python2.6 -c "import numpy" > /dev/null 2>&1; then + NUMPY_PRESENT=yes +- elif python -c "import Numeric"> /dev/null 2>&1; then ++ elif python2.6 -c "import Numeric"> /dev/null 2>&1; then + NUMERIC_PRESENT=yes + fi + # Search for sqlite3 +- if python -c "import sqlite3" > /dev/null 2>&1; then ++ if python2.6 -c "import sqlite3" > /dev/null 2>&1; then + SQLITE3_PRESENT=yes + fi fi - fi -@@ -533,11 +533,11 @@ +@@ -535,11 +535,11 @@ NEWATM_PRESENT=yes NEWATM_LIB_DIR=$DIR fi @@ -148,9 +150,9 @@ BLAS_PRESENT=yes BLAS_LIB_DIR=$DIR fi -diff -ruN --exclude='*~' gildas-src-apr10a/packages/clic/lib/Makefile gildas-src-apr10a.patched/packages/clic/lib/Makefile ---- gildas-src-apr10a/packages/clic/lib/Makefile 2010-03-10 18:20:57.000000000 +0100 -+++ gildas-src-apr10a.patched/packages/clic/lib/Makefile 2010-04-02 00:03:40.000000000 +0200 +diff -ruN --exclude='*~' gildas-src-aug10a/packages/clic/lib/Makefile gildas-src-aug10a.patched/packages/clic/lib/Makefile +--- gildas-src-aug10a/packages/clic/lib/Makefile 2010-05-25 06:26:45.000000000 +0200 ++++ gildas-src-aug10a.patched/packages/clic/lib/Makefile 2010-08-25 17:12:33.000000000 +0200 @@ -55,7 +55,7 @@ # Mathematical library dependency ifeq ($(LINEAR),lapack) @@ -160,10 +162,10 @@ else ifeq ($(LINEAR),nag) LINEAR_LIB_OBJECTS = mth_nag.o -diff -ruN --exclude='*~' gildas-src-apr10a/packages/clic07/lib/Makefile gildas-src-apr10a.patched/packages/clic07/lib/Makefile ---- gildas-src-apr10a/packages/clic07/lib/Makefile 2009-07-10 12:17:56.000000000 +0200 -+++ gildas-src-apr10a.patched/packages/clic07/lib/Makefile 2010-04-02 00:03:40.000000000 +0200 -@@ -49,7 +49,7 @@ +diff -ruN --exclude='*~' gildas-src-aug10a/packages/clic07/lib/Makefile gildas-src-aug10a.patched/packages/clic07/lib/Makefile +--- gildas-src-aug10a/packages/clic07/lib/Makefile 2010-05-27 14:01:58.000000000 +0200 ++++ gildas-src-aug10a.patched/packages/clic07/lib/Makefile 2010-08-25 17:12:33.000000000 +0200 +@@ -50,7 +50,7 @@ # Mathematical library dependency ifeq ($(LINEAR),lapack) LINEAR_LIB_OBJECTS = singular.o mth_lapack.o Index: gildas.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- gildas.info 12 Jul 2010 10:54:38 -0000 1.41 +++ gildas.info 30 Aug 2010 14:50:46 -0000 1.42 @@ -1,12 +1,12 @@ Package: gildas -Version: 201007 +Version: 201008 Revision: 1 Architecture: powerpc, i386, x86_64 Description: Radioastronomy data analysis software License: OSI-Approved Maintainer: Sebastien Maret <bm...@us...> -Source: http://www.iram.fr/~gildas/dist/gildas-src-jul10b.tar.gz -Source-MD5: d0d045d8e5953199c52f96c24999eee4 +Source: http://www.iram.fr/~gildas/dist/gildas-src-aug10a.tar.gz +Source-MD5: 1f872e794ca1b5f4ea13ba7ec0a5fc81 Depends: << fftw3-shlibs, gcc44-shlibs | gcc45-shlibs, libpng3-shlibs, lesstif-shlibs, python26, numpy-py26, x11 @@ -16,7 +16,7 @@ lesstif, python26-shlibs, sed, slatec, x11-dev << PatchFile: gildas.patch -PatchFile-MD5: 61f6b9b48e78e3cbc68e475dd3e1ecf2 +PatchFile-MD5: 3e2c9ad4d2011ac43ff09ab8d0aaa06b CompileScript: << true << |