r44664 - 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
Wed Apr 4 22:00:51 UTC 2012
Author: sylvestre
Date: Wed Apr 4 22:00:49 2012
New Revision: 44664
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44664
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=44664&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/debian-install.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/debian-install.diff Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/setup.py
===================================================================
---- 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
+--- aster-10.6.0-1.orig/setup.py 2012-04-04 22:31:29.000000000 +0200
++++ aster-10.6.0-1/setup.py 2012-04-04 22:31:29.000000000 +0200
@@ -175,6 +175,7 @@
cache_file = os.path.join(setup_maindir, 'setup.cache')
@@ -12,8 +12,8 @@
}
Index: aster-10.6.0-1/products.py
===================================================================
---- 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
+--- aster-10.6.0-1.orig/products.py 2012-04-04 22:31:29.000000000 +0200
++++ aster-10.6.0-1/products.py 2012-04-04 22:31:43.000000000 +0200
@@ -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=44664&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/README_Calibre.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/README_Calibre.txt 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/README_Calibre.txt 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,3514 @@
+===============================================
+README FOR CODE_ASTER INSTALLATION ON CALIBRE 5
@@ -3520,7 +3520,7 @@
Index: aster-10.6.0-1/README_aster.html
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/README_aster.html 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/README_aster.html 2012-04-04 22:31:29.000000000 +0200
@@ -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">
@@ -4160,7 +4160,7 @@
Index: aster-10.6.0-1/README_aster.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/README_aster.txt 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/README_aster.txt 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,332 @@
+README FOR CODE_ASTER INSTALLATION
+==================================
@@ -4497,7 +4497,7 @@
Index: aster-10.6.0-1/__pkginfo__.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/__pkginfo__.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/__pkginfo__.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -4537,7 +4537,7 @@
Index: aster-10.6.0-1/as_setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/as_setup.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/as_setup.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,2132 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -6674,7 +6674,7 @@
Index: aster-10.6.0-1/check_compilers.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/check_compilers.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/check_compilers.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,991 @@
+"""
+Configure compilers
@@ -7670,7 +7670,7 @@
Index: aster-10.6.0-1/check_compilers_src.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/check_compilers_src.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/check_compilers_src.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,96 @@
+"""
+This module contains source code for testing compilers, libs...
@@ -7771,7 +7771,7 @@
Index: aster-10.6.0-1/check_popen_thread.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/check_popen_thread.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/check_popen_thread.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,50 @@
+"""
+Provoke the Popen bug.
@@ -7826,7 +7826,7 @@
Index: aster-10.6.0-1/mprint.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/mprint.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/mprint.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -7929,7 +7929,7 @@
Index: aster-10.6.0-1/post_install.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/post_install.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/post_install.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,181 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -8115,7 +8115,7 @@
Index: aster-10.6.0-1/products.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/products.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/products.py 2012-04-04 22:31:45.000000000 +0200
@@ -0,0 +1,1255 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -9375,7 +9375,7 @@
Index: aster-10.6.0-1/products_versions.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/products_versions.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/products_versions.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,33 @@
+
+dict_prod = {'aster': 'STA10.6.0',
@@ -9413,7 +9413,7 @@
Index: aster-10.6.0-1/setup.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/setup.cfg 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/setup.cfg 2012-04-04 22:31:47.000000000 +0200
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -9570,7 +9570,7 @@
Index: aster-10.6.0-1/setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/setup.py 2012-01-26 13:41:59.000000000 +0100
++++ aster-10.6.0-1/setup.py 2012-04-04 22:31:45.000000000 +0200
@@ -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=44664&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F
===================================================================
--- 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
++++ aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F 2012-04-04 22:31:29.000000000 +0200
@@ -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=44664&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.diff Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/products.py
===================================================================
---- 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
+--- aster-10.6.0-1.orig/products.py 2012-04-04 22:31:29.000000000 +0200
++++ aster-10.6.0-1/products.py 2012-04-04 22:31:29.000000000 +0200
@@ -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=44664&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/setup.cfg
===================================================================
---- 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
+--- aster-10.6.0-1.orig/setup.cfg 2012-04-04 22:31:29.000000000 +0200
++++ aster-10.6.0-1/setup.cfg 2012-04-04 22:31:29.000000000 +0200
@@ -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=44664&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 Wed Apr 4 22:00:49 2012
@@ -1,7 +1,7 @@
Index: aster-10.6.0-1/STA10.6/astest/liste_short_without_homard
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/STA10.6/astest/liste_short_without_homard 2012-01-26 13:42:15.000000000 +0100
++++ aster-10.6.0-1/STA10.6/astest/liste_short_without_homard 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,24 @@
+forma02a
+forma02b
More information about the debian-science-commits
mailing list