r44114 - in /packages/code-aster/aster/trunk/debian: ./ patches/

apalazzi-guest at users.alioth.debian.org apalazzi-guest at users.alioth.debian.org
Sat Dec 10 11:50:03 UTC 2011 

Author: apalazzi-guest
Date: Sat Dec 10 11:50:02 2011
New Revision: 44114

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44114
Log:
Updated files to code-aster version NEW11.0


Added:
    packages/code-aster/aster/trunk/debian/patches/med_f90.diff   (with props)
Modified:
    packages/code-aster/aster/trunk/debian/README.Debian
    packages/code-aster/aster/trunk/debian/changelog
    packages/code-aster/aster/trunk/debian/code-aster-dev.install
    packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install
    packages/code-aster/aster/trunk/debian/code-aster-engine.install
    packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
    packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
    packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
    packages/code-aster/aster/trunk/debian/code-aster-test.install
    packages/code-aster/aster/trunk/debian/config-mpi.txt
    packages/code-aster/aster/trunk/debian/config.txt
    packages/code-aster/aster/trunk/debian/control
    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/mpi.diff
    packages/code-aster/aster/trunk/debian/patches/scotch-5.1.11.patch
    packages/code-aster/aster/trunk/debian/patches/series
    packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff
    packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch
    packages/code-aster/aster/trunk/debian/rules

Modified: packages/code-aster/aster/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/README.Debian?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/README.Debian (original)
+++ packages/code-aster/aster/trunk/debian/README.Debian Sat Dec 10 11:50:02 2011
@@ -1,13 +1,15 @@
 codeaster
 ---------
 
-By default codeaster is using python2.6
+The Code Aster binary has been built with _USE_MED_SHORT_INT
+
+By default codeaster is using python2.7
 To change the python version used, you simply have to make 
 the following change in $ASTER_ROOT (ie /usr/lib/codeaster) :
 
 ln -s config-py2.5.txt config.txt
  
-To add the MPI version, append STA10.3_mpi to the lists of versions 
+To add the MPI version, append STA11.1_mpi to the lists of versions 
 in /etc/codeaster/aster :
 
 vers : STA10.3, STA10.3_mpi

Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-aster (10.3.0-1-1) unstable; urgency=low
+aster (11.0.10-1-1) unstable; urgency=low
 
   * Initial import (Closes: #458812)
     Based on the work of Andre Espaze, Christophe Trophime, Adam C. Powell, IV
     and Andrea Palazzi
 
- -- Andrea Palazzi <palazziandrea at yahoo.it>  Sun, 12 Jun 2011 21:42:12 +0200
+ -- Andrea Palazzi <palazziandrea at yahoo.it>  Mon, 05 Dec 2011 21:42:12 +0100

Modified: packages/code-aster/aster/trunk/debian/code-aster-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-dev.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-dev.install Sat Dec 10 11:50:02 2011
@@ -1,10 +1,10 @@
-usr/lib/codeaster/STA10.3/python*/lib/libaster.a
-usr/lib/codeaster/STA10.3/python*/lib/libferm.a
-usr/lib/codeaster/STA10.3/bibf90
-usr/lib/codeaster/STA10.3/bibc
-usr/lib/codeaster/STA10.3/bibfor
-usr/lib/codeaster/STA10.3/fermetur
-usr/lib/codeaster/STA10.3/catapy
-usr/lib/codeaster/STA10.3/catalo
-usr/lib/codeaster/STA10.3/Makefile*
-usr/lib/codeaster/STA10.3/python*/obj
+usr/lib/codeaster/NEW11.0/python*/lib/libaster.a
+usr/lib/codeaster/NEW11.0/python*/lib/libferm.a
+usr/lib/codeaster/NEW11.0/bibf90
+usr/lib/codeaster/NEW11.0/bibc
+usr/lib/codeaster/NEW11.0/bibfor
+usr/lib/codeaster/NEW11.0/fermetur
+usr/lib/codeaster/NEW11.0/catapy
+usr/lib/codeaster/NEW11.0/catalo
+usr/lib/codeaster/NEW11.0/Makefile*
+usr/lib/codeaster/NEW11.0/python*/obj

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install Sat Dec 10 11:50:02 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/STA10.3/asterd_py*
-usr/lib/codeaster/STA10.3/python*/lib/libasterd.a
-usr/lib/codeaster/STA10.3/python*/lib/libfermd.a
+usr/lib/codeaster/NEW11.0/asterd_py*
+usr/lib/codeaster/NEW11.0/python*/lib/libasterd.a
+usr/lib/codeaster/NEW11.0/python*/lib/libfermd.a

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.install Sat Dec 10 11:50:02 2011
@@ -1,12 +1,12 @@
-usr/lib/codeaster/STA10.3/asteru_py*
-usr/lib/codeaster/STA10.3/dtag
-usr/lib/codeaster/STA10.3/materiau
-usr/lib/codeaster/STA10.3/bibpyt
-usr/lib/codeaster/STA10.3/python*/commande
-usr/lib/codeaster/STA10.3/python*/cata_ele.pickled
-usr/lib/codeaster/STA10.3/python*/elements
-usr/lib/codeaster/STA10.3/config-py*.txt
-usr/lib/codeaster/STA10.3/profile_py*.sh
-usr/lib/codeaster/STA10.3/forma01a.export
+usr/lib/codeaster/NEW11.0/asteru_py*
+usr/lib/codeaster/NEW11.0/dtag
+usr/lib/codeaster/NEW11.0/materiau
+usr/lib/codeaster/NEW11.0/bibpyt
+usr/lib/codeaster/NEW11.0/python*/commande
+usr/lib/codeaster/NEW11.0/python*/cata_ele.pickled
+usr/lib/codeaster/NEW11.0/python*/elements
+usr/lib/codeaster/NEW11.0/config-py*.txt
+usr/lib/codeaster/NEW11.0/profile_py*.sh
+usr/lib/codeaster/NEW11.0/forma01a.export
 usr/lib/codeaster/outils/onmetis*
-usr/lib/codeaster/STA10.3/forma01a.export
+usr/lib/codeaster/NEW11.0/forma01a.export

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postinst?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Sat Dec 10 11:50:02 2011
@@ -3,12 +3,12 @@
 set -ex
 
 dc_hostname="$(hostname 2>/dev/null)"
-dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
-#dc_pyvers=2.6
+#dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
+dc_pyvers=2.7
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.3/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/STA10.3/config-py$v.txt /usr/lib/codeaster/STA10.3/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/NEW11.0/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/NEW11.0/config-py$v.txt /usr/lib/codeaster/NEW11.0/config.txt; \
 done	
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postrm?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Sat Dec 10 11:50:02 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.3/config.txt
+    rm -f /usr/lib/codeaster/NEW11.0/config.txt
 fi
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install Sat Dec 10 11:50:02 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/STA10.3_mpi/asterd_py*
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/NEW11.0_mpi/asterd_py*
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libfermd*.a

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install Sat Dec 10 11:50:02 2011
@@ -1,12 +1,12 @@
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libaster*.a
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libferm*.a
-usr/lib/codeaster/STA10.3_mpi/python*/lib/libfermd*.a
-usr/lib/codeaster/STA10.3_mpi/bibf90
-usr/lib/codeaster/STA10.3_mpi/bibc
-usr/lib/codeaster/STA10.3_mpi/bibfor
-usr/lib/codeaster/STA10.3_mpi/fermetur
-usr/lib/codeaster/STA10.3_mpi/catapy
-usr/lib/codeaster/STA10.3_mpi/catalo
-usr/lib/codeaster/STA10.3_mpi/Makefile*
-usr/lib/codeaster/STA10.3_mpi/python*/obj
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libaster*.a
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libferm*.a
+usr/lib/codeaster/NEW11.0_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/NEW11.0_mpi/bibf90
+usr/lib/codeaster/NEW11.0_mpi/bibc
+usr/lib/codeaster/NEW11.0_mpi/bibfor
+usr/lib/codeaster/NEW11.0_mpi/fermetur
+usr/lib/codeaster/NEW11.0_mpi/catapy
+usr/lib/codeaster/NEW11.0_mpi/catalo
+usr/lib/codeaster/NEW11.0_mpi/Makefile*
+usr/lib/codeaster/NEW11.0_mpi/python*/obj

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install Sat Dec 10 11:50:02 2011
@@ -1,10 +1,10 @@
-usr/lib/codeaster/STA10.3_mpi/asteru_py*
-usr/lib/codeaster/STA10.3_mpi/dtag
-usr/lib/codeaster/STA10.3_mpi/materiau
-usr/lib/codeaster/STA10.3_mpi/bibpyt
-usr/lib/codeaster/STA10.3_mpi/python*/commande
-usr/lib/codeaster/STA10.3_mpi/python*/cata_ele.pickled
-usr/lib/codeaster/STA10.3_mpi/python*/elements
-usr/lib/codeaster/STA10.3_mpi/config-py*.txt
-usr/lib/codeaster/STA10.3_mpi/profile_py*.sh
-usr/lib/codeaster/STA10.3_mpi/forma01a.export
+usr/lib/codeaster/NEW11.0_mpi/asteru_py*
+usr/lib/codeaster/NEW11.0_mpi/dtag
+usr/lib/codeaster/NEW11.0_mpi/materiau
+usr/lib/codeaster/NEW11.0_mpi/bibpyt
+usr/lib/codeaster/NEW11.0_mpi/python*/commande
+usr/lib/codeaster/NEW11.0_mpi/python*/cata_ele.pickled
+usr/lib/codeaster/NEW11.0_mpi/python*/elements
+usr/lib/codeaster/NEW11.0_mpi/config-py*.txt
+usr/lib/codeaster/NEW11.0_mpi/profile_py*.sh
+usr/lib/codeaster/NEW11.0_mpi/forma01a.export

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst Sat Dec 10 11:50:02 2011
@@ -3,12 +3,12 @@
 set -ex
 
 dc_hostname="$(hostname 2>/dev/null)"
-dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
-#dc_pyvers=2.6
+#dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
+dc_pyvers=2.7
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.3_mpi/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/STA10.3_mpi/config-py$v.txt /usr/lib/codeaster/STA10.3_mpi/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/NEW11.0_mpi/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/NEW11.0_mpi/config-py$v.txt /usr/lib/codeaster/NEW11.0_mpi/config.txt; \
 done	
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm Sat Dec 10 11:50:02 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.3_mpi/config.txt
+    rm -f /usr/lib/codeaster/NEW11.0_mpi/config.txt
 fi
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-test.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-test.install?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Sat Dec 10 11:50:02 2011
@@ -1,2 +1,2 @@
-usr/lib/codeaster/STA10.3/astest/*
-usr/lib/codeaster/STA10.3/astout.export
+usr/lib/codeaster/NEW11.0/astest/*
+usr/lib/codeaster/NEW11.0/astout.export

Modified: packages/code-aster/aster/trunk/debian/config-mpi.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi.txt?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi.txt Sat Dec 10 11:50:02 2011
@@ -62,18 +62,18 @@
 #
 CC             | cc      | ?     | /usr/bin/mpicc
 OPTC_D         | cc      | ?     | -c -g  -fno-stack-protector -fPIC
-OPTC_O         | cc      | ?     | -c -O2 -fno-stack-protector -fPIC
-INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include
+OPTC_O         | cc      | ?     | -c -O2 -fno-tree-dse -fno-stack-protector -fPIC
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/NEW11.0_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include -I/usr/include/mpi
 #
 F77            | f77     | ?     | /usr/bin/mpif90
 OPTF_D         | f77     | ?     | -c -g  -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF_O         | f77     | ?     | -c -O2 -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF          | include | ?     | -I/usr/include
+OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+INCLF          | include | ?     | -I/usr/include -I/usr/include/mpi
 #
 F90            | f90     | ?     | /usr/bin/mpif90
 OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF90_O       | f90     | ?     | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibf90/include_mumps-4.9.2 -I/usr/include -I/usr/include 
+OPTF90_O       | f90     | ?     | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/NEW11.0_mpi/bibf90/include_mumps-4.9.2 -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.3_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.3_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/config.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config.txt?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config.txt (original)
+++ packages/code-aster/aster/trunk/debian/config.txt Sat Dec 10 11:50:02 2011
@@ -7,6 +7,8 @@
 #  LIB        : archiver
 #  BIBL       : librairies linked with Code_Aster (with options -L/-l eventually)
 #  PYTHON     : Python binary
+#  DEVEL      : Set to no to tell that this version does not allow user developments.
+#               Typically for a binary distribution (default is yes)
 #  LINK       : linker command
 #  OPTL       : linker options
 #  CC         : C compiler command
@@ -33,7 +35,7 @@
 #  CRP / CRS  : tools to check source files and programming rules
 #  ID_PERF    : a label to identify a group of machines (use by TEST_TEMPS command)
 #
-ID_PERF        | id      | -     | calcul8
+ID_PERF        | id      | -     | atlante
 #
 ENV_SH         | env     | -     | profile_pyPYVER.sh
 #
@@ -44,35 +46,35 @@
 BIBL           | hdf5    | 1.6.5 | -L/usr/lib -lhdf5
 BIBL           | zmat    | 8.4   | 
 BIBL           | mumps   | ?     | -L/usr/lib -ldmumps_seq -L/usr/lib -lzmumps_seq -L/usr/lib -lsmumps_seq -L/usr/lib -lcmumps_seq -L/usr/lib -lmumps_common_seq -L/usr/lib -lpord_seq -L/usr/lib -lmpiseq_seq -L/usr/lib -lscotchmetis -L/usr/lib -lscotch
-BIBL           | scotch  | 4.0   | -L/usr/lib -lscotch -L/usr/lib -lscotcherr -L/usr/lib -lscotcherrexit
+BIBL           | scotch  | 4.0   | -L/usr/lib -lesmumps -L/usr/lib -lscotch -L/usr/lib -lscotcherr
 BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lgfortran
 BIBL           | mpi     | 2     | 
 BIBL           | c++     | ?     | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
-BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
+BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -L/usr/lib -ldl -L/usr/lib -lutil -L/usr/lib -lm -lpthread -lz
 #
-DEFS           | defined | ?     | LINUX64 _HAVE_MUMPS H5_USE_16_API H5PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS           | defined | ?     | LINUX64 H5_USE_16_API _HAVE_MUMPS _USE_MED_SHORT_INT H5_PART_HAS_MPI
 #
-NOBUILD        | option  | ?     |  bibfor/from_c
+NOBUILD        | option  | ?     | 
 #
 PYTHON         | python  | 2.4   | /usr/bin/pythonPYVER
 #
 LINK           | link    | ?     | /usr/bin/gfortran
-OPTL           | link    | ?     |  -fopenmp
+OPTL           | link    | ?     | -fopenmp
 #
 CC             | cc      | ?     | /usr/bin/gcc
-OPTC_D         | cc      | ?     | -c -I/usr/include/mpi
-OPTC_O         | cc      | ?     | -c -I/usr/include/mpi
-INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch
+OPTC_D         | cc      | ?     | -c -g  -fno-stack-protector -fPIC -fopenmp
+OPTC_O         | cc      | ?     | -c -O2 -fno-tree-dse -fno-stack-protector -fopenmp
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/NEW11.0/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include/mpi
 #
 F77            | f77     | ?     | /usr/bin/gfortran
-OPTF_D         | f77     | ?     | -c -g  -fopenmp -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF_O         | f77     | ?     | -c -O2 -fopenmp -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF          | include | ?     | 
+OPTF_D         | f77     | ?     | -c -g  -fPIC  -fopenmp  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fopenmp
+INCLF          | include | ?     | -I/usr/include/mpi
 #
 F90            | f90     | ?     | /usr/bin/gfortran
-OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF90_O       | f90     | ?     | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibf90/include_mumps-4.9.2
+OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fopenmp  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF90_O       | f90     | ?     | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fopenmp
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/NEW11.0/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -110,8 +112,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.3/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.3/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Sat Dec 10 11:50:02 2011
@@ -4,9 +4,10 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Andrea Palazzi <palazziandrea at yahoo.it>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7), quilt, gfortran (>= 4.3.2),
- liblapack-dev, libblas-dev, libhdf5-mpi-dev, libmed-dev,
- python-all-dev, python-support, python-numpy, code-aster-run (>= 1.8.1-2),
+Build-Depends: debhelper (>= 7), quilt, gfortran (>= 4.3.2), ssh, 
+ liblapack-dev, libblas-dev, libhdf5-mpi-dev,
+ libmed-dev (>= 3.0), libmedc-dev (>= 3.0),
+ python2.7-dev, python-support, python-numpy, code-aster-run (>= 1.8.1-2),
  libmumps-seq-dev (>= 4.9.2.dfsg-4), libmumps-ptscotch-dev (>= 4.9.2.dfsg-4), 
  libscotch-dev, libscotchmetis-dev, libptscotch-dev, libscalapack-mpi-dev,
  libblacs-mpi-dev, mpi-default-dev, libscotchparmetis-dev

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=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/debian-install.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/debian-install.diff Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/setup.py
+Index: aster-11.0.10-1/setup.py
 ===================================================================
---- aster-10.3.0-1.orig/setup.py	2011-02-16 12:10:39.000000000 +0100
-+++ aster-10.3.0-1/setup.py	2011-02-16 12:13:19.000000000 +0100
+--- aster-11.0.10-1.orig/setup.py	2011-02-16 12:10:39.000000000 +0100
++++ aster-11.0.10-1/setup.py	2011-02-16 12:13:19.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: aster-10.3.0-1/products_versions.py
+Index: aster-11.0.10-1/products_versions.py
 ===================================================================
---- aster-10.3.0-1.orig/products_versions.py	2011-02-16 12:10:39.000000000 +0100
-+++ aster-10.3.0-1/products_versions.py	2011-02-16 12:13:19.000000000 +0100
+--- aster-11.0.10-1.orig/products_versions.py	2011-02-16 12:10:39.000000000 +0100
++++ aster-11.0.10-1/products_versions.py	2011-02-16 12:13:19.000000000 +0100
 @@ -16,7 +16,7 @@
   'omniORB': '4.1.4',
   'omniORBpy': '3.4',
@@ -23,10 +23,10 @@
  
  dict_prod_param = {'__to_install__': ['med',
                      'astk',
-Index: aster-10.3.0-1/products.py
+Index: aster-11.0.10-1/products.py
 ===================================================================
---- aster-10.3.0-1.orig/products.py	2011-02-16 12:10:39.000000000 +0100
-+++ aster-10.3.0-1/products.py	2011-02-16 12:13:19.000000000 +0100
+--- aster-11.0.10-1.orig/products.py	2011-02-16 12:10:39.000000000 +0100
++++ aster-11.0.10-1/products.py	2011-02-16 12:13:19.000000000 +0100
 @@ -923,8 +923,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=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/README_Calibre.txt
+Index: aster-11.0.10-1/README_Calibre.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/README_Calibre.txt	2011-02-15 10:09:17.000000000 +0100
++++ aster-11.0.10-1/README_Calibre.txt	2011-02-15 10:09:17.000000000 +0100
 @@ -0,0 +1,3510 @@
 +===============================================
 +README FOR CODE_ASTER INSTALLATION ON CALIBRE 5
@@ -3513,10 +3513,10 @@
 +    ii  zlib1g              1.2.3-13            compression library - runtime
 +    ii  zlib1g-dev          1.2.3-13            compression library - development
 +    ii  zoo                 2.10-18             manipulate zoo archives
-Index: aster-10.3.0-1/README_aster.html
+Index: aster-11.0.10-1/README_aster.html
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/README_aster.html	2011-02-15 10:09:15.000000000 +0100
++++ aster-11.0.10-1/README_aster.html	2011-02-15 10:09:15.000000000 +0100
 @@ -0,0 +1,631 @@
 +<?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">
@@ -4075,7 +4075,7 @@
 +using as_run.</p>
 +<p>Rerun the built</p>
 +<pre class="literal-block">
-+  cd /opt/aster/STA10.3
++  cd /opt/aster/NEW11.0
 +  make
 +or
 +  /opt/aster/bin/as_run --make
@@ -4112,7 +4112,7 @@
 +<li><p class="first">Change to your ASTER_ROOT directory and enter in
 +ASTER_VERSION directory</p>
 +<pre class="literal-block">
-+cd /opt/aster/STA10.3
++cd /opt/aster/NEW11.0
 +</pre>
 +</li>
 +<li><p class="first">Start the small example</p>
@@ -4127,7 +4127,7 @@
 +<li><p class="first">Change to your ASTER_ROOT directory and enter in
 +ASTER_VERSION directory</p>
 +<pre class="literal-block">
-+cd /opt/aster/STA10.3
++cd /opt/aster/NEW11.0
 +</pre>
 +</li>
 +<li><p class="first">Start the complete test suite</p>
@@ -4149,10 +4149,10 @@
 +</div>
 +</body>
 +</html>
-Index: aster-10.3.0-1/README_aster.txt
+Index: aster-11.0.10-1/README_aster.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/README_aster.txt	2011-02-15 10:09:16.000000000 +0100
++++ aster-11.0.10-1/README_aster.txt	2011-02-15 10:09:16.000000000 +0100
 @@ -0,0 +1,328 @@
 +README FOR CODE_ASTER INSTALLATION
 +==================================
@@ -4424,7 +4424,7 @@
 +
 +   Rerun the built ::
 +      
-+      cd /opt/aster/STA10.3
++      cd /opt/aster/NEW11.0
 +      make
 +    or
 +      /opt/aster/bin/as_run --make
@@ -4459,7 +4459,7 @@
 +   - Change to your ASTER_ROOT directory and enter in
 +     ASTER_VERSION directory ::
 +     
-+      cd /opt/aster/STA10.3
++      cd /opt/aster/NEW11.0
 +
 +   - Start the small example ::
 +   
@@ -4470,7 +4470,7 @@
 +   - Change to your ASTER_ROOT directory and enter in
 +     ASTER_VERSION directory ::
 +     
-+      cd /opt/aster/STA10.3
++      cd /opt/aster/NEW11.0
 +
 +   - Start the complete test suite ::
 +      
@@ -4482,10 +4482,10 @@
 +      liste_etude list to run only about 30 tests.
 +
 +
-Index: aster-10.3.0-1/__pkginfo__.py
+Index: aster-11.0.10-1/__pkginfo__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/__pkginfo__.py	2011-02-15 10:09:13.000000000 +0100
++++ aster-11.0.10-1/__pkginfo__.py	2011-02-15 10:09:13.000000000 +0100
 @@ -0,0 +1,35 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -4522,10 +4522,10 @@
 +author_email = "code-aster .at. edf.fr"
 +
 +
-Index: aster-10.3.0-1/as_setup.py
+Index: aster-11.0.10-1/as_setup.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/as_setup.py	2011-02-15 10:09:11.000000000 +0100
++++ aster-11.0.10-1/as_setup.py	2011-02-15 10:09:11.000000000 +0100
 @@ -0,0 +1,2092 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -6619,10 +6619,10 @@
 +    #print ">>>", src, dst, os.sep.join(common)
 +    os.symlink(src, dst)
 +
-Index: aster-10.3.0-1/check_compilers.py
+Index: aster-11.0.10-1/check_compilers.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/check_compilers.py	2011-02-15 10:09:11.000000000 +0100
++++ aster-11.0.10-1/check_compilers.py	2011-02-15 10:09:11.000000000 +0100
 @@ -0,0 +1,935 @@
 +"""
 +Configure compilers
@@ -7559,10 +7559,10 @@
 +         return os.linesep.join(txt)
 +
 +
-Index: aster-10.3.0-1/check_compilers_src.py
+Index: aster-11.0.10-1/check_compilers_src.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/check_compilers_src.py	2011-02-15 10:09:12.000000000 +0100
++++ aster-11.0.10-1/check_compilers_src.py	2011-02-15 10:09:12.000000000 +0100
 @@ -0,0 +1,96 @@
 +"""
 +This module contains source code for testing compilers, libs...
@@ -7660,10 +7660,10 @@
 +
 +
 +
-Index: aster-10.3.0-1/check_popen_thread.py
+Index: aster-11.0.10-1/check_popen_thread.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/check_popen_thread.py	2011-02-15 10:09:12.000000000 +0100
++++ aster-11.0.10-1/check_popen_thread.py	2011-02-15 10:09:12.000000000 +0100
 @@ -0,0 +1,50 @@
 +"""
 +Provoke the Popen bug.
@@ -7715,10 +7715,10 @@
 +   iret = main()
 +   print iret
 +
-Index: aster-10.3.0-1/mprint.py
+Index: aster-11.0.10-1/mprint.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/mprint.py	2011-02-15 10:09:13.000000000 +0100
++++ aster-11.0.10-1/mprint.py	2011-02-15 10:09:13.000000000 +0100
 @@ -0,0 +1,98 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -7818,10 +7818,10 @@
 +         else:
 +            print 'Unexpected object %s : %s' % (type(f), repr(f))
 +
-Index: aster-10.3.0-1/post_install.py
+Index: aster-11.0.10-1/post_install.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/post_install.py	2011-02-15 10:09:14.000000000 +0100
++++ aster-11.0.10-1/post_install.py	2011-02-15 10:09:14.000000000 +0100
 @@ -0,0 +1,181 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -8004,10 +8004,10 @@
 +      reinstall(d, dtrans, opts.relocated)
 +
 +
-Index: aster-10.3.0-1/products.py
+Index: aster-11.0.10-1/products.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/products.py	2011-02-15 10:09:14.000000000 +0100
++++ aster-11.0.10-1/products.py	2011-02-15 10:09:14.000000000 +0100
 @@ -0,0 +1,1265 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -9274,10 +9274,10 @@
 +   )
 +   return setup
 +
-Index: aster-10.3.0-1/products_versions.py
+Index: aster-11.0.10-1/products_versions.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/products_versions.py	2011-02-15 10:09:15.000000000 +0100
++++ aster-11.0.10-1/products_versions.py	2011-02-15 10:09:15.000000000 +0100
 @@ -0,0 +1,39 @@
 +
 +dict_prod = {'aster': '10.3.0',
@@ -9318,10 +9318,10 @@
 +                    'gmsh',
 +                    'eficas-doc']}
 +
-Index: aster-10.3.0-1/setup.cfg
+Index: aster-11.0.10-1/setup.cfg
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/setup.cfg	2011-02-15 10:09:18.000000000 +0100
++++ aster-11.0.10-1/setup.cfg	2011-02-15 10:09:18.000000000 +0100
 @@ -0,0 +1,152 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -9475,10 +9475,10 @@
 +# Salome version supported by pylotage
 +SALOME_VERSION = 'DEFAULT'    # DEFAULT means the last one supported by pylotage
 +
-Index: aster-10.3.0-1/setup.py
+Index: aster-11.0.10-1/setup.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/setup.py	2011-02-15 10:09:18.000000000 +0100
++++ aster-11.0.10-1/setup.py	2011-02-15 10:09:18.000000000 +0100
 @@ -0,0 +1,925 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-

Added: 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=44114&op=file
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (added)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Sat Dec 10 11:50:02 2011
@@ -1,0 +1,29 @@
+Index: aster-11.0.10-1/NEW11.0/bibf90/echange/mfchac.F
+===================================================================
+--- aster-11.0.10-1.orig/NEW11.0/bibf90/echange/mfchac.F	2011-12-02 09:30:44.000000000 +0100
++++ aster-11.0.10-1/NEW11.0/bibf90/echange/mfchac.F	2011-12-02 09:30:03.000000000 +0100
+@@ -23,8 +23,6 @@
+       CHARACTER*80  UNIDT
+       INTEGER FID, NCOMP, CRET, TYPE
+ 
+-C     UNITE DU PAS DE TEMPS EST UN GRANDEUR PAS UTILISEE DANS ASTER
+-      UNIDT = ' '
+ #ifdef _DISABLE_MED
+       CALL U2MESS('F','FERMETUR_2')
+ #else
+@@ -34,6 +32,7 @@
+ #ifdef _DEBUG_MED
+       PRINT *,'=== MFCHAC ==='
+ #endif
++      UNIDT = ' '
+       FID4 = FID
+       NCOMP4 = NCOMP
+       TYPE4 = TYPE
+@@ -41,6 +40,7 @@
+      &            UNIT, UNIDT, NOMAMD, CRET4)
+       CRET = CRET4
+ #else
++      UNIDT = ' '
+       CALL MFDCRE(FID, CHA, TYPE, NCOMP, COMP,
+      &            UNIT, UNIDT, NOMAMD, CRET)
+ #endif

Propchange: packages/code-aster/aster/trunk/debian/patches/med_f90.diff
------------------------------------------------------------------------------
    svn:executable = *

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=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.diff Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/products.py
+Index: aster-11.0.10-1/products.py
 ===================================================================
---- aster-10.3.0-1.orig/products.py	2011-02-16 12:15:48.000000000 +0100
-+++ aster-10.3.0-1/products.py	2011-02-16 12:17:31.000000000 +0100
+--- aster-11.0.10-1.orig/products.py	2011-02-16 12:15:48.000000000 +0100
++++ aster-11.0.10-1/products.py	2011-02-16 12:17:31.000000000 +0100
 @@ -967,11 +967,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/scotch-5.1.11.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/scotch-5.1.11.patch?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/scotch-5.1.11.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/scotch-5.1.11.patch Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/STA10.3/bibc/scotch/fetsco.c
+Index: aster-11.0.10-1/NEW11.0/bibc/scotch/fetsco.c
 ===================================================================
---- aster-10.3.0-1.orig/STA10.3/bibc/scotch/fetsco.c	2011-02-16 13:17:01.000000000 +0100
-+++ aster-10.3.0-1/STA10.3/bibc/scotch/fetsco.c	2011-02-16 13:18:38.000000000 +0100
+--- aster-11.0.10-1.orig/NEW11.0/bibc/scotch/fetsco.c	2011-02-16 13:17:01.000000000 +0100
++++ aster-11.0.10-1/NEW11.0/bibc/scotch/fetsco.c	2011-02-16 13:18:38.000000000 +0100
 @@ -20,7 +20,7 @@
  #include "aster.h"
  

Modified: packages/code-aster/aster/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/series?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/series (original)
+++ packages/code-aster/aster/trunk/debian/patches/series Sat Dec 10 11:50:02 2011
@@ -1,6 +1,6 @@
 edf-install.patch
 setup.cfg.diff
 debian-install.diff
+med_f90.diff
 mpi.diff
 tests_without_homard.patch
-#scotch-5.1.11.patch

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=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/setup.cfg
+Index: aster-11.0.10-1/setup.cfg
 ===================================================================
---- aster-10.3.0-1.orig/setup.cfg	2011-02-15 10:22:21.000000000 +0100
-+++ aster-10.3.0-1/setup.cfg	2011-02-15 10:24:31.000000000 +0100
+--- aster-11.0.10-1.orig/setup.cfg	2011-02-15 10:22:21.000000000 +0100
++++ aster-11.0.10-1/setup.cfg	2011-02-15 10:24:31.000000000 +0100
 @@ -103,29 +103,29 @@
  #INCLUDEDIR=['/myprefix/include', ]
  

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=44114&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 Sat Dec 10 11:50:02 2011
@@ -1,7 +1,7 @@
-Index: aster-10.3.0-1/STA10.3/astest/liste_short_without_homard
+Index: aster-11.0.10-1/NEW11.0/astest/liste_short_without_homard
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.3.0-1/STA10.3/astest/liste_short_without_homard	2011-01-06 17:04:40.000000000 +0100
++++ aster-11.0.10-1/NEW11.0/astest/liste_short_without_homard	2011-01-06 17:04:40.000000000 +0100
 @@ -0,0 +1,24 @@
 +forma02a
 +forma02b

Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=44114&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Sat Dec 10 11:50:02 2011
@@ -6,13 +6,13 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-PYVERS := $(shell pyversions -vr debian/control)
-#PYVERS := 2.6
+#PYVERS := $(shell pyversions -vr debian/control)
+PYVERS := 2.7
 
-STA_VERSION=STA10.3
-PTA_VERSION=STA10.3_mpi
-ASTER_VERSION=10.3.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-3
+STA_VERSION=NEW11.0
+PTA_VERSION=NEW11.0_mpi
+ASTER_VERSION=11.0.10
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
 
 DEB_SOURCE_PACKAGE := aster
 DEB_UPSTREAM_VERSION := $(ASTER_VERSION)-1
@@ -47,6 +47,7 @@
 
 	# Remove UMAT binaries from test cases
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001a.44
+	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001b.44
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.44
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.46
 
@@ -161,9 +162,9 @@
 get-orig-source:
 	# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	mkdir -p tmp
-	wget -Ptmp "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=885" 
-	# wget -Ptmp "http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz"
-	cd tmp && mv "spip.php?action=dw2_out&id=885" aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
+	# wget -Ptmp "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=885" 
+	wget -Ptmp "http://www.code-aster.org/FICHIERS/aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz"
+	# cd tmp && mv "spip.php?action=dw2_out&id=885" aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	
 	# Go to SRC directory and retreive astk source
 	cd tmp && tar xzf aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz

More information about the debian-science-commits mailing list