Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27453
Modified Files:
gildas.info gildas.patch
Log Message:
New version
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gildas.patch 7 May 2013 09:22:51 -0000 1.5
+++ gildas.patch 10 Jun 2013 09:43:02 -0000 1.6
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile
gildas-src-apr13a.patched/admin/Makefile
---- gildas-src-apr13a/admin/Makefile 2012-06-27 15:22:50.000000000 +0200
-+++ gildas-src-apr13a.patched/admin/Makefile 2013-04-25 15:46:10.000000000
+0200
+diff -ruN gildas-src-jun13a/admin/Makefile
gildas-src-jun13a.patched/admin/Makefile
+--- gildas-src-jun13a/admin/Makefile 2012-06-27 15:22:50.000000000 +0200
++++ gildas-src-jun13a.patched/admin/Makefile 2013-06-10 10:34:30.000000000
+0200
@@ -27,31 +27,31 @@
integ: integ-message
@@ -55,10 +55,10 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.build
gildas-src-apr13a.patched/admin/Makefile.build
---- gildas-src-apr13a/admin/Makefile.build 2013-01-25 15:20:29.000000000
+0100
-+++ gildas-src-apr13a.patched/admin/Makefile.build 2013-04-25
15:46:10.000000000 +0200
-@@ -360,6 +360,10 @@
+diff -ruN gildas-src-jun13a/admin/Makefile.build
gildas-src-jun13a.patched/admin/Makefile.build
+--- gildas-src-jun13a/admin/Makefile.build 2013-05-16 17:10:54.000000000
+0200
++++ gildas-src-jun13a.patched/admin/Makefile.build 2013-06-10
10:34:30.000000000 +0200
+@@ -368,6 +368,10 @@
-lm:
@@ -69,9 +69,9 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.def
gildas-src-apr13a.patched/admin/Makefile.def
---- gildas-src-apr13a/admin/Makefile.def 2013-03-06 11:12:23.000000000
+0100
-+++ gildas-src-apr13a.patched/admin/Makefile.def 2013-04-25
15:46:10.000000000 +0200
+diff -ruN gildas-src-jun13a/admin/Makefile.def
gildas-src-jun13a.patched/admin/Makefile.def
+--- gildas-src-jun13a/admin/Makefile.def 2013-05-28 17:26:05.000000000
+0200
++++ gildas-src-jun13a.patched/admin/Makefile.def 2013-06-10
10:34:30.000000000 +0200
@@ -312,8 +312,8 @@
# C compilation
@@ -107,9 +107,9 @@
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
-diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.python
gildas-src-apr13a.patched/admin/Makefile.python
---- gildas-src-apr13a/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
-+++ gildas-src-apr13a.patched/admin/Makefile.python 2013-04-25
15:46:10.000000000 +0200
+diff -ruN gildas-src-jun13a/admin/Makefile.python
gildas-src-jun13a.patched/admin/Makefile.python
+--- gildas-src-jun13a/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
++++ gildas-src-jun13a.patched/admin/Makefile.python 2013-06-10
10:34:30.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
@@ -119,9 +119,9 @@
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
-diff -ruN --exclude='*~' gildas-src-apr13a/admin/gildas-env.sh
gildas-src-apr13a.patched/admin/gildas-env.sh
---- gildas-src-apr13a/admin/gildas-env.sh 2013-03-06 11:17:37.000000000
+0100
-+++ gildas-src-apr13a.patched/admin/gildas-env.sh 2013-04-25
15:46:10.000000000 +0200
+diff -ruN gildas-src-jun13a/admin/gildas-env.sh
gildas-src-jun13a.patched/admin/gildas-env.sh
+--- gildas-src-jun13a/admin/gildas-env.sh 2013-05-30 15:17:40.000000000
+0200
++++ gildas-src-jun13a.patched/admin/gildas-env.sh 2013-06-10
10:37:52.000000000 +0200
@@ -422,7 +422,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
@@ -145,11 +145,11 @@
PY_VERS=`echo $PY_VERS_FULL | sed
"s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
# Search for Python header and library.
kernel/python/binding/setup.py
# does exactly the same, so this should be consistent
-- PYTHON_INC_DIR=`python -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY')"`
-+ PYTHON_INC_DIR=`python2.7 -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY')"`
+- PYTHON_INC_DIR=`python -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
++ PYTHON_INC_DIR=`python2.7 -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
if [ -e "$PYTHON_INC_DIR/Python.h" ]; then PYTHON_INC=yes; else
PYTHON_INC=no; fi
-- PYTHON_LIB_DIR=`python -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('LIBDIR')"`
-+ PYTHON_LIB_DIR=@PREFIX@/lib/python2.7/config/
+- PYTHON_LIB_DIR=`python -c "import distutils.sysconfig;
print(distutils.sysconfig.get_config_var('LIBDIR'))"`
++ PYTHON_LIB_DIR=@PREFIX@/lib/python2.7/config/
PYTHON_LIB=yes # libpython name on the various supported
systems is just
# unpredictible. Can not check in advance if
the linker will
# find it or not.
@@ -158,8 +158,8 @@
- if python -c "import numpy" > /dev/null 2>&1; then
+ if python2.7 -c "import numpy" > /dev/null 2>&1; then
NUMPY_PRESENT=yes
-- NUMPY_INC_DIR=`python -c "import numpy; print
numpy.__path__[0] + '/core/include'"`
-+ NUMPY_INC_DIR=`python2.7 -c "import numpy; print
numpy.__path__[0] + '/core/include'"`
+- NUMPY_INC_DIR=`python -c "import numpy;
print(numpy.__path__[0] + '/core/include')"`
++ NUMPY_INC_DIR=`python2.7 -c "import numpy;
print(numpy.__path__[0] + '/core/include')"`
if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
NUMPY_INC_PRESENT=yes
else
@@ -210,9 +210,9 @@
#
if [ "$X11_INC" = "yes" ]; then
gagenv_message "Found X11 header in $X11_INC_DIR"
-diff -ruN --exclude='*~' gildas-src-apr13a/packages/clic/lib/Makefile
gildas-src-apr13a.patched/packages/clic/lib/Makefile
---- gildas-src-apr13a/packages/clic/lib/Makefile 2012-10-18
11:16:23.000000000 +0200
-+++ gildas-src-apr13a.patched/packages/clic/lib/Makefile 2013-04-25
15:46:10.000000000 +0200
+diff -ruN gildas-src-jun13a/packages/clic/lib/Makefile
gildas-src-jun13a.patched/packages/clic/lib/Makefile
+--- gildas-src-jun13a/packages/clic/lib/Makefile 2012-10-18
11:16:23.000000000 +0200
++++ gildas-src-jun13a.patched/packages/clic/lib/Makefile 2013-06-10
10:34:30.000000000 +0200
@@ -61,7 +61,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gildas.info 7 May 2013 09:22:51 -0000 1.17
+++ gildas.info 10 Jun 2013 09:43:02 -0000 1.18
@@ -1,12 +1,12 @@
Package: gildas
-Version: 201305a
+Version: 201306a
Revision: 1
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-may13a.tar.gz
-Source-MD5: 0cfd8fe0d48920b1436f8d1fda9fe4b5
-SourceDirectory: gildas-src-may13a
+Source: http://www.iram.fr/~gildas/dist/gildas-src-jun13a.tar.gz
+Source-MD5: b9046b5c9525e48904c27f6688ac5e57
+SourceDirectory: gildas-src-jun13a
Depends: <<
atk1-shlibs, cairo-shlibs, fftw3-shlibs, fontconfig2-shlibs,
freetype219-shlibs, gcc48-shlibs, glib2-shlibs, gtk+2-shlibs,
@@ -20,7 +20,7 @@
<<
BuildConflicts: atlas
PatchFile: gildas.patch
-PatchFile-MD5: 75fe2831a60a4f9cef3f8fc66d3399f3
+PatchFile-MD5: 5a60ec305ba576b275ce99be02c0eaa6
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
true
------------------------------------------------------------------------------
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
