r44418 - in /packages/code-aster/aster/trunk/debian/patches: debian-install.diff edf-install.patch med_f90.diff mpi.diff setup.cfg.diff tests_without_homard.patch
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Jan 26 14:43:49 UTC 2012
Author: sylvestre
Date: Thu Jan 26 14:43:48 2012
New Revision: 44418
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44418
Log:
Refresh of the patches
Modified:
packages/code-aster/aster/trunk/debian/patches/debian-install.diff
packages/code-aster/aster/trunk/debian/patches/edf-install.patch
packages/code-aster/aster/trunk/debian/patches/med_f90.diff
packages/code-aster/aster/trunk/debian/patches/mpi.diff
packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff
packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch
Modified: packages/code-aster/aster/trunk/debian/patches/debian-install.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/debian-install.diff?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/debian-install.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/debian-install.diff Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: setup.py
+Index: aster-10.6.0-1/setup.py
===================================================================
---- a/setup.py 2011-12-16 16:19:30.000000000 +0100
-+++ b/setup.py 2011-12-16 16:20:16.000000000 +0100
+--- aster-10.6.0-1.orig/setup.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/setup.py 2012-01-26 13:42:10.000000000 +0100
@@ -175,6 +175,7 @@
cache_file = os.path.join(setup_maindir, 'setup.cache')
@@ -10,10 +10,10 @@
'ASTER_ROOT' : '/opt/aster',
'SOURCEDIR' : os.path.normpath(os.path.join(setup_maindir, 'SRC')),
}
-Index: products.py
+Index: aster-10.6.0-1/products.py
===================================================================
---- a/products.py 2011-12-16 16:19:30.000000000 +0100
-+++ b/products.py 2011-12-16 16:20:16.000000000 +0100
+--- aster-10.6.0-1.orig/products.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/products.py 2012-01-26 13:42:10.000000000 +0100
@@ -912,8 +912,8 @@
'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS', 'HOME_NUMPY', 'USE_NUMPY',
Modified: packages/code-aster/aster/trunk/debian/patches/edf-install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/edf-install.patch?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: README_Calibre.txt
+Index: aster-10.6.0-1/README_Calibre.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/README_Calibre.txt 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/README_Calibre.txt 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,3514 @@
+===============================================
+README FOR CODE_ASTER INSTALLATION ON CALIBRE 5
@@ -3517,10 +3517,10 @@
+ ii zlib1g-dev 1.2.3-13 compression library - development
+ ii zoo 2.10-18 manipulate zoo archives
+
-Index: README_aster.html
+Index: aster-10.6.0-1/README_aster.html
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/README_aster.html 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/README_aster.html 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -4157,10 +4157,10 @@
+</div>
+</body>
+</html>
-Index: README_aster.txt
+Index: aster-10.6.0-1/README_aster.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/README_aster.txt 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/README_aster.txt 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,332 @@
+README FOR CODE_ASTER INSTALLATION
+==================================
@@ -4494,10 +4494,10 @@
+ liste_etude list to run only about 30 tests.
+
+
-Index: __pkginfo__.py
+Index: aster-10.6.0-1/__pkginfo__.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/__pkginfo__.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/__pkginfo__.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -4534,10 +4534,10 @@
+author_email = "code-aster .at. edf.fr"
+
+
-Index: as_setup.py
+Index: aster-10.6.0-1/as_setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/as_setup.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/as_setup.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,2132 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -6671,10 +6671,10 @@
+ dict : unexpandvars_dict,
+ }
+ return dfunc.get(type(obj), unexpandvars_string)(obj, vars)
-Index: check_compilers.py
+Index: aster-10.6.0-1/check_compilers.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/check_compilers.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/check_compilers.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,991 @@
+"""
+Configure compilers
@@ -7667,10 +7667,10 @@
+ if verbose:
+ return os.linesep.join(txt)
+
-Index: check_compilers_src.py
+Index: aster-10.6.0-1/check_compilers_src.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/check_compilers_src.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/check_compilers_src.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,96 @@
+"""
+This module contains source code for testing compilers, libs...
@@ -7768,10 +7768,10 @@
+
+
+
-Index: check_popen_thread.py
+Index: aster-10.6.0-1/check_popen_thread.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/check_popen_thread.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/check_popen_thread.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,50 @@
+"""
+Provoke the Popen bug.
@@ -7823,10 +7823,10 @@
+ iret = main()
+ print iret
+
-Index: mprint.py
+Index: aster-10.6.0-1/mprint.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/mprint.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/mprint.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -7926,10 +7926,10 @@
+ else:
+ print 'Unexpected object %s : %s' % (type(f), repr(f))
+
-Index: post_install.py
+Index: aster-10.6.0-1/post_install.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/post_install.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/post_install.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,181 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -8112,10 +8112,10 @@
+ reinstall(d, dtrans, opts.relocated)
+
+
-Index: products.py
+Index: aster-10.6.0-1/products.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/products.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/products.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,1255 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -9372,10 +9372,10 @@
+
+
+
-Index: products_versions.py
+Index: aster-10.6.0-1/products_versions.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/products_versions.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/products_versions.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,33 @@
+
+dict_prod = {'aster': 'STA10.6.0',
@@ -9410,10 +9410,10 @@
+ 'grace',
+ 'eficas-doc']}
+
-Index: setup.cfg
+Index: aster-10.6.0-1/setup.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/setup.cfg 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/setup.cfg 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -9567,10 +9567,10 @@
+# ZMAT libraries (commercial, available at http://www.mat.ensmp.fr/)
+#HOME_ZMAT='' # which contains PUBLIC/lib-Linux4/libZmat_base.so and others
+
-Index: setup.py
+Index: aster-10.6.0-1/setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/setup.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-10.6.0-1/setup.py 2012-01-26 13:41:59.000000000 +0100
@@ -0,0 +1,907 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
Modified: packages/code-aster/aster/trunk/debian/patches/med_f90.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/med_f90.diff?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: aster-10.6.0-1/bibf90/echange/mfchac.F
+Index: aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F
===================================================================
---- aster-10.6.0-1.orig/bibf90/echange/mfchac.F 2012-01-26 11:56:36.000000000 +0100
-+++ aster-10.6.0-1/bibf90/echange/mfchac.F 2012-01-26 11:56:58.000000000 +0100
+--- aster-10.6.0-1.orig/STA10.6/bibf90/echange/mfchac.F 2012-01-11 16:12:03.000000000 +0100
++++ aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F 2012-01-26 13:46:02.000000000 +0100
@@ -23,8 +23,6 @@
CHARACTER*80 UNIDT
INTEGER FID, NCOMP, CRET, TYPE
Modified: packages/code-aster/aster/trunk/debian/patches/mpi.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/mpi.diff?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.diff Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: products.py
+Index: aster-10.6.0-1/products.py
===================================================================
---- a/products.py 2011-12-16 16:18:51.000000000 +0100
-+++ b/products.py 2011-12-16 16:19:01.000000000 +0100
+--- aster-10.6.0-1.orig/products.py 2012-01-26 13:42:10.000000000 +0100
++++ aster-10.6.0-1/products.py 2012-01-26 13:42:12.000000000 +0100
@@ -956,11 +956,11 @@
# Only Linux/Linux64 are up-to-date, not other platforms. Just kept for history.
if cfg['IFDEF'] in ('LINUX', 'P_LINUX'):
Modified: packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: setup.cfg
+Index: aster-10.6.0-1/setup.cfg
===================================================================
---- a/setup.cfg 2011-12-16 16:19:30.000000000 +0100
-+++ b/setup.cfg 2011-12-16 16:20:10.000000000 +0100
+--- aster-10.6.0-1.orig/setup.cfg 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/setup.cfg 2012-01-26 13:42:06.000000000 +0100
@@ -10,7 +10,7 @@
#-------------------------------------------------------------------------------
Modified: packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch?rev=44418&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch Thu Jan 26 14:43:48 2012
@@ -1,7 +1,7 @@
-Index: STA10.6/astest/liste_short_without_homard
+Index: aster-10.6.0-1/STA10.6/astest/liste_short_without_homard
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/STA10.6/astest/liste_short_without_homard 2011-12-16 16:20:30.000000000 +0100
++++ aster-10.6.0-1/STA10.6/astest/liste_short_without_homard 2012-01-26 13:42:15.000000000 +0100
@@ -0,0 +1,24 @@
+forma02a
+forma02b
More information about the debian-science-commits
mailing list