r44188 - in /packages/code-aster/aster/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Dec 16 15:48:28 UTC 2011
Author: trophime-guest
Date: Fri Dec 16 15:48:28 2011
New Revision: 44188
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44188
Log:
fix building with latest astk 1.10.0 + some cleanup
Added:
packages/code-aster/aster/trunk/debian/as_test.sh
packages/code-aster/aster/trunk/debian/config-mpi.txt
packages/code-aster/aster/trunk/debian/config-mpi_64.txt
- copied, changed from r44150, packages/code-aster/aster/trunk/debian/config-mpi.txt
packages/code-aster/aster/trunk/debian/config.txt
packages/code-aster/aster/trunk/debian/config_64.txt
- copied, changed from r44150, packages/code-aster/aster/trunk/debian/config.txt
Removed:
packages/code-aster/aster/trunk/debian/patches/aster-config.patch
packages/code-aster/aster/trunk/debian/patches/scotch-5.1.11.patch
Modified:
packages/code-aster/aster/trunk/debian/code-aster-test.install
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/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
packages/code-aster/aster/trunk/debian/profile.sh
packages/code-aster/aster/trunk/debian/rules
Added: packages/code-aster/aster/trunk/debian/as_test.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/as_test.sh?rev=44188&op=file
==============================================================================
--- packages/code-aster/aster/trunk/debian/as_test.sh (added)
+++ packages/code-aster/aster/trunk/debian/as_test.sh Fri Dec 16 15:48:28 2011
@@ -1,0 +1,27 @@
+#!/bin/sh
+DESTDIR=/tmp/as_test_${1}_${2}
+DESTFILE=${DESTDIR}/astout.export
+mkdir -p $DESTDIR
+echo P actions astout > ${DESTFILE}
+echo P version ${2} >> ${DESTFILE}
+echo P debug nodebug >> ${DESTFILE}
+echo A rep_mat /usr/lib/codeaster/${2}/materiau >> ${DESTFILE}
+
+echo P mode interactif >> ${DESTFILE}
+
+echo "# parameters" >> ${DESTFILE}
+echo P ncpus 1 >> ${DESTFILE}
+echo P nbmaxnook 500 >> ${DESTFILE}
+echo P cpresok RESOK >> ${DESTFILE}
+echo P facmtps 3 >> ${DESTFILE}
+echo P tpsjob 300 >> ${DESTFILE}
+
+echo "# list of the test to run" >> ${DESTFILE}
+echo F list ${3} D 0 >> ${DESTFILE}
+
+echo "# results destination" >> ${DESTFILE}
+echo R resu_test ${DESTDIR} R 0 >> ${DESTFILE}
+
+as_run ${DESTFILE} | tee ${DESTDIR}/test.log
+
+# python aster_test_parse.py ${1} ${2} ${3}
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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Fri Dec 16 15:48:28 2011
@@ -1,2 +1,4 @@
-usr/lib/codeaster/NEW11.0/astest/*
+usr/lib/codeaster/NEW11.0/astest
usr/lib/codeaster/NEW11.0/astout.export
+
+
Added: 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=44188&op=file
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (added)
+++ packages/code-aster/aster/trunk/debian/config-mpi.txt Fri Dec 16 15:48:28 2011
@@ -1,0 +1,135 @@
+# Configuration file
+#
+# Fields are separated by a " | " (the space is significative)
+#
+# Keywords :
+# ENV_SH : environment script (absolute filename or relative to current directory)
+# LIB : archiver
+# BIBL : librairies linked with Code_Aster (with options -L/-l eventually)
+# PYTHON : Python binary
+# LINK : linker command
+# OPTL : linker options
+# CC : C compiler command
+# DEFS : pre-processor #define commands separated by space or comma
+# they will be added to all compilation options OPTx_x
+# OPTC_D : C compiler options using DEBUG mode
+# OPTC_O : C compiler options using NODEBUG mode
+# INCL : C include flags
+# F77 : Fortran compiler command
+# OPTF_D : Fortran compiler options using DEBUG mode
+# OPTF_O : Fortran compiler options using NODEBUG mode
+# INCLF : Fortran include flags
+# F90 : Fortran 90 compiler command
+# OPTF90_D : Fortran 90 compiler options using DEBUG mode
+# OPTF90_O : Fortran 90 compiler options using NODEBUG mode
+# INCLF90 : Fortran 90 include flags
+# G77_AGLA : used only for configuration management of EDF version
+# SUPERV : Code_Aster Python packages
+# REPPY : name of 'bibpyt' in the temporary execution directory
+# ARGPYT : main python module
+# ARGEXE : arguments passed to Code_Aster executable
+# REPOUT : tools directory
+# MAKE_SURCH_OFFI/MAKE_CAPY_OFFI : Python modules to compiling elements catalogs
+# 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 | - | HOSTNAME
+#
+ENV_SH | env | - | profile_pyPYVER.sh
+#
+LIB | ar | ? | /usr/bin/ar -rv
+#
+BIBL | python | 2.4 | -L/usr/lib -L/usr/lib/pythonPYVER/config -lpythonPYVER
+BIBL | med | 2.3.5 | -L/usr/lib -lmed
+BIBL | hdf5 | 1.6.5 | -L/usr/lib -lhdf5
+BIBL | zmat | 8.4 |
+BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -L/usr/lib -lzmumps_ptscotch -L/usr/lib -lsmumps_ptscotch -L/usr/lib -lcmumps_ptscotch -L/usr/lib -lmumps_common_ptscotch -L/usr/lib -lpord_ptscotch -L/usr/lib -lesmumps -lscotch -L/usr/lib -lscotchmetis
+BIBL | scotch | 4.0 | -L/usr/lib -lptscotch -L/usr/lib -lptscotcherr -L/usr/lib -lptscotcherrexit
+BIBL | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
+BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
+BIBL | mpi | 2 | -L/usr/lib -lmpi -lmpi_f77 -lmpi_f90
+BIBL | c++ | ? | -lstdc++ -lsupc++
+BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
+#
+DEFS | defined | ? | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI
+#
+NOBUILD | option | ? |
+#
+PYTHON | python | 2.4 | /usr/bin/pythonPYVER
+#
+LINK | link | ? | /usr/bin/mpicc
+OPTL | link | ? |
+#
+CC | cc | ? | /usr/bin/mpicc
+OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC
+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
+OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fPIC
+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
+OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC
+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
+#
+SRCFOR | src | 11-04 | bibfor
+SRCF90 | src | 11-04 | bibf90
+SRCFERM | src | 11-04 | fermetur
+SRCC | src | 11-04 | bibc
+SRCPY | src | 11-04 | bibpyt
+SRCCATA | src | 11-04 | catalo
+SRCCAPY | src | 11-04 | catapy
+SRCTEST | src | 11-04 | astest
+SRCMAT | src | 11-04 | materiau
+SRCHIST | src | 11-04 | histor
+#
+MAKE | build | - | debug nodebug
+BIN_NODBG | bin | 11-04 | asteru_pyPYVER
+BIN_DBG | bin | 11-04 | asterd_pyPYVER
+BINCMDE | bin | 11-04 | pythonPYVER/commande
+BINELE | bin | 11-04 | pythonPYVER/elements
+BINPICKLED | bin | 11-04 | pythonPYVER/cata_ele.pickled
+BINLIB_NODBG | bin | 11-04 | pythonPYVER/lib/libaster_mpi.a
+BINLIB_DBG | bin | 11-04 | pythonPYVER/lib/libasterd_mpi.a
+BINLIBF_NODBG | bin | 02-05 | pythonPYVER/lib/libferm_mpi.a
+BINLIBF_DBG | bin | 02-05 | pythonPYVER/lib/libfermd_mpi.a
+BINOBJ_NODBG | bin | 11-04 | pythonPYVER/obj/aster
+BINOBJF_NODBG | bin | 11-04 | pythonPYVER/obj/ferm
+BINOBJ_DBG | bin | 11-04 | pythonPYVER/obj/asterd
+BINOBJF_DBG | bin | 11-04 | pythonPYVER/obj/fermd
+#
+REPPY | exec | 11-04 | Python
+ARGPYT | exec | 03-02 | Execution/E_SUPERV.py
+ARGEXE | exec | 03-02 | -eficas_path ./Python
+#
+MAKE_SURCH_OFFI | build | 11-04 | Lecture_Cata_Ele/make_surch_offi.py
+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/NEW11.0_mpi/materiau
+REPDEX | exec | 02-05 | /ASTER_ROOT/NEW11.0_mpi/datg
+#
+SUPERV | exec | 03-02 | Accas
+SUPERV | exec | 03-02 | Build
+SUPERV | exec | 03-02 | Comportement
+SUPERV | exec | 03-02 | Execution
+SUPERV | exec | 03-02 | Intranet
+SUPERV | exec | 03-02 | Macro
+SUPERV | exec | 12-06 | Meidee
+SUPERV | exec | 09-06 | Messages
+SUPERV | exec | 03-02 | Noyau
+SUPERV | exec | 05-04 | Outils
+SUPERV | exec | 01-07 | SD
+SUPERV | exec | 01-03 | Stanley
+SUPERV | exec | 03-02 | Utilitai
+SUPERV | exec | 03-02 | Validation
+#
+GZIP | tool | ? | gzip
+#
+I18N | i18n | - |
+
Copied: packages/code-aster/aster/trunk/debian/config-mpi_64.txt (from r44150, 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_64.txt?rev=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Fri Dec 16 15:48:28 2011
@@ -33,7 +33,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 | - | HOSTNAME
#
ENV_SH | env | - | profile_pyPYVER.sh
#
@@ -46,9 +46,9 @@
BIBL | mumps | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -L/usr/lib -lzmumps_ptscotch -L/usr/lib -lsmumps_ptscotch -L/usr/lib -lcmumps_ptscotch -L/usr/lib -lmumps_common_ptscotch -L/usr/lib -lpord_ptscotch -L/usr/lib -lesmumps -lscotch -L/usr/lib -lscotchmetis
BIBL | scotch | 4.0 | -L/usr/lib -lptscotch -L/usr/lib -lptscotcherr -L/usr/lib -lptscotcherrexit
BIBL | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
-BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lgfortran
-BIBL | mpi | 2 | -L/usr/lib -lmpi -lmpi_f77 -lmpi_f90
-BIBL | c++ | ? | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
+BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
+BIBL | mpi | 2 | -L/usr/lib -lmpi -lmpi_f77 -lmpi_f90
+BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
DEFS | defined | ? | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI _USE_MED_SHORT_INT
@@ -58,7 +58,7 @@
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/mpicc
-OPTL | link | ? | -fopenmp
+OPTL | link | ? |
#
CC | cc | ? | /usr/bin/mpicc
OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC
@@ -66,13 +66,13 @@
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 -fno-tree-dse -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF_D | f77 | ? | -c -g -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fPIC -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 -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
+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 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC -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
Added: 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=44188&op=file
==============================================================================
--- packages/code-aster/aster/trunk/debian/config.txt (added)
+++ packages/code-aster/aster/trunk/debian/config.txt Fri Dec 16 15:48:28 2011
@@ -1,0 +1,136 @@
+# Configuration file
+#
+# Fields are separated by a " | " (the space is significative)
+#
+# Keywords :
+# ENV_SH : environment script (absolute filename or relative to current directory)
+# 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
+# DEFS : pre-processor #define commands separated by space or comma
+# they will be added to all compilation options OPTx_x
+# OPTC_D : C compiler options using DEBUG mode
+# OPTC_O : C compiler options using NODEBUG mode
+# INCL : C include flags
+# F77 : Fortran compiler command
+# OPTF_D : Fortran compiler options using DEBUG mode
+# OPTF_O : Fortran compiler options using NODEBUG mode
+# INCLF : Fortran include flags
+# F90 : Fortran 90 compiler command
+# OPTF90_D : Fortran 90 compiler options using DEBUG mode
+# OPTF90_O : Fortran 90 compiler options using NODEBUG mode
+# INCLF90 : Fortran 90 include flags
+# G77_AGLA : used only for configuration management of EDF version
+# SUPERV : Code_Aster Python packages
+# REPPY : name of 'bibpyt' in the temporary execution directory
+# ARGPYT : main python module
+# ARGEXE : arguments passed to Code_Aster executable
+# REPOUT : tools directory
+# MAKE_SURCH_OFFI/MAKE_CAPY_OFFI : Python modules to compiling elements catalogs
+# 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 | - | HOSTNAME
+#
+ENV_SH | env | - | profile_pyPYVER.sh
+#
+LIB | ar | ? | /usr/bin/ar -rv
+#
+BIBL | python | PYVER | -L/usr/lib -L/usr/lib/pythonPYVER/config -lpythonPYVER
+BIBL | med | 2.3.5 | -L/usr/lib -lmed
+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 -lesmumps -L/usr/lib -lscotch -L/usr/lib -lscotcherr
+BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
+BIBL | mpi | 2 |
+BIBL | c++ | ? | -lstdc++ -lsupc++
+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 H5_USE_16_API _HAVE_MUMPS H5_PART_HAS_MPI
+#
+NOBUILD | option | ? |
+#
+PYTHON | python | PYVER | /usr/bin/pythonPYVER
+#
+LINK | link | ? | /usr/bin/gfortran
+OPTL | link | ? | -fopenmp
+#
+CC | cc | ? | /usr/bin/gcc
+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 -fPIC -fopenmp
+OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -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 -fopenmp
+OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fopenmp
+INCLF90 | include | ? | -IDEB_DESTDIR/ASTER_ROOT/NEW11.0/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
+#
+G77_AGLA | g77 | ? | unused
+#
+SRCFOR | src | 11-04 | bibfor
+SRCF90 | src | 11-04 | bibf90
+SRCFERM | src | 11-04 | fermetur
+SRCC | src | 11-04 | bibc
+SRCPY | src | 11-04 | bibpyt
+SRCCATA | src | 11-04 | catalo
+SRCCAPY | src | 11-04 | catapy
+SRCTEST | src | 11-04 | astest
+SRCMAT | src | 11-04 | materiau
+SRCHIST | src | 11-04 | histor
+#
+MAKE | build | - | debug nodebug
+BIN_NODBG | bin | 11-04 | asteru_pyPYVER
+BIN_DBG | bin | 11-04 | asterd_pyPYVER
+BINCMDE | bin | 11-04 | pythonPYVER/commande
+BINELE | bin | 11-04 | pythonPYVER/elements
+BINPICKLED | bin | 11-04 | pythonPYVER/cata_ele.pickled
+BINLIB_NODBG | bin | 11-04 | pythonPYVER/lib/libaster.a
+BINLIB_DBG | bin | 11-04 | pythonPYVER/lib/libasterd.a
+BINLIBF_NODBG | bin | 02-05 | pythonPYVER/lib/libferm.a
+BINLIBF_DBG | bin | 02-05 | pythonPYVER/lib/libfermd.a
+BINOBJ_NODBG | bin | 11-04 | pythonPYVER/obj/aster
+BINOBJF_NODBG | bin | 11-04 | pythonPYVER/obj/ferm
+BINOBJ_DBG | bin | 11-04 | pythonPYVER/obj/asterd
+BINOBJF_DBG | bin | 11-04 | pythonPYVER/obj/fermd
+#
+REPPY | exec | 11-04 | Python
+ARGPYT | exec | 03-02 | Execution/E_SUPERV.py
+ARGEXE | exec | 03-02 | -eficas_path ./Python
+#
+MAKE_SURCH_OFFI | build | 11-04 | Lecture_Cata_Ele/make_surch_offi.py
+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/NEW11.0/materiau
+REPDEX | exec | 02-05 | /ASTER_ROOT/NEW11.0/datg
+#
+SUPERV | exec | 03-02 | Accas
+SUPERV | exec | 03-02 | Build
+SUPERV | exec | 03-02 | Comportement
+SUPERV | exec | 03-02 | Execution
+SUPERV | exec | 03-02 | Intranet
+SUPERV | exec | 03-02 | Macro
+SUPERV | exec | 12-06 | Meidee
+SUPERV | exec | 09-06 | Messages
+SUPERV | exec | 03-02 | Noyau
+SUPERV | exec | 05-04 | Outils
+SUPERV | exec | 01-07 | SD
+SUPERV | exec | 01-03 | Stanley
+SUPERV | exec | 03-02 | Utilitai
+SUPERV | exec | 03-02 | Validation
+#
+GZIP | tool | ? | /usr/bin/gzip
+#
+I18N | i18n | - |
+
Copied: packages/code-aster/aster/trunk/debian/config_64.txt (from r44150, packages/code-aster/aster/trunk/debian/config.txt)
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config_64.txt?rev=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_64.txt Fri Dec 16 15:48:28 2011
@@ -35,28 +35,28 @@
# 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 | - | atlante
+ID_PERF | id | - | HOSTNAME
#
ENV_SH | env | - | profile_pyPYVER.sh
#
LIB | ar | ? | /usr/bin/ar -rv
#
-BIBL | python | 2.4 | -L/usr/lib -L/usr/lib/pythonPYVER/config -lpythonPYVER
+BIBL | python | PYVER | -L/usr/lib -L/usr/lib/pythonPYVER/config -lpythonPYVER
BIBL | med | 2.3.5 | -L/usr/lib -lmed
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 -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 | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
BIBL | mpi | 2 |
-BIBL | c++ | ? | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
+BIBL | c++ | ? | -lstdc++ -lsupc++
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 H5_USE_16_API _HAVE_MUMPS _USE_MED_SHORT_INT H5_PART_HAS_MPI
#
NOBUILD | option | ? |
#
-PYTHON | python | 2.4 | /usr/bin/pythonPYVER
+PYTHON | python | PYVER | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/gfortran
OPTL | link | ? | -fopenmp
@@ -130,7 +130,7 @@
SUPERV | exec | 03-02 | Utilitai
SUPERV | exec | 03-02 | Validation
#
-GZIP | tool | ? | ?GZIP?
+GZIP | tool | ? | /usr/bin/gzip
#
I18N | i18n | - |
Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Fri Dec 16 15:48:28 2011
@@ -4,13 +4,14 @@
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), ssh,
+Build-Depends: debhelper (>= 7), quilt, gfortran (>= 4.3.2), openssh-client,
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
+ libblacs-mpi-dev, mpi-default-dev, libscotchparmetis-dev,
+ hostname
Homepage: http://www.code-aster.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-aster/aster/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-aster/aster/
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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/debian-install.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/debian-install.diff Fri Dec 16 15:48:28 2011
@@ -1,7 +1,7 @@
Index: aster-11.0.10-1/setup.py
===================================================================
---- 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
+--- aster-11.0.10-1.orig/setup.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-11.0.10-1/setup.py 2011-12-16 16:20:16.000000000 +0100
@@ -175,6 +175,7 @@
cache_file = os.path.join(setup_maindir, 'setup.cache')
@@ -10,24 +10,11 @@
'ASTER_ROOT' : '/opt/aster',
'SOURCEDIR' : os.path.normpath(os.path.join(setup_maindir, 'SRC')),
}
-Index: aster-11.0.10-1/products_versions.py
-===================================================================
---- 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',
- 'pylotage': '2.0.5',
-- 'scotch': '4.0'}
-+ 'scotch': '5.1.11'}
-
- dict_prod_param = {'__to_install__': ['med',
- 'astk',
Index: aster-11.0.10-1/products.py
===================================================================
---- 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 @@
+--- aster-11.0.10-1.orig/products.py 2011-12-16 16:19:30.000000000 +0100
++++ aster-11.0.10-1/products.py 2011-12-16 16:20:16.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',
'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
@@ -38,7 +25,7 @@
set=['MEDLIB', 'HDFLIB', 'MATHLIB',
'MUMPSLIB', 'ZMATLIB', 'SCOTCHLIB',
'LDFLAGS',
-@@ -968,8 +968,13 @@
+@@ -957,8 +957,13 @@
if cfg['IFDEF'] in ('LINUX', 'P_LINUX'):
zmat_platform='Linux'
mpilibs.extend(['mpich'])
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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Fri Dec 16 15:48:28 2011
@@ -1,8 +1,8 @@
Index: aster-11.0.10-1/README_Calibre.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_Calibre.txt 2011-02-15 10:09:17.000000000 +0100
-@@ -0,0 +1,3510 @@
++++ aster-11.0.10-1/README_Calibre.txt 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,3514 @@
+===============================================
+README FOR CODE_ASTER INSTALLATION ON CALIBRE 5
+===============================================
@@ -29,7 +29,7 @@
+Identification des machines de test ::
+
+ Calibre 5.0.3
-+ Linux clau5cac 2.6.26-2-amd64 #1 SMP Wed Feb 17 16:39:06 UTC 2010 x86_64
++ Linux clau5cac 2.6.26-2-amd64 #1 SMP Wed Feb 17 16:39:06 UTC 2010 x86_64
+
+
+Note d'installation
@@ -73,17 +73,17 @@
+de l'installation.
+
+ #. Préparation de l'environnement des compilateurs Intel ::
-+
++
+ export INTEL_LICENSE_FILE=/path/to/directory/licenses
+ source /opt/intel/cce/10.0.026/bin/iccvars.sh
+ source /opt/intel/fce/10.0.026/bin/ifortvars.sh
-+
-+
++
++
+ #. Indiquer dans le fichier ``setup.cfg`` ::
+
+ # GNU compiler for all products
+ PREFER_COMPILER = 'GNU'
-+
++
+ # Intel compilers for aster, mumps, metis
+ PREFER_COMPILER_aster = 'Intel_without_MATH'
+ PREFER_COMPILER_mumps = PREFER_COMPILER_aster
@@ -92,7 +92,7 @@
+
+ # use lapack/blas instead of mkl
+ MATHLIB='-L/usr/lib -llapack -lblas -lgfortran'
-+
++
+ #. Lancer ``setup.py``
+
+
@@ -110,10 +110,10 @@
+La compilation de l'ensemble des produits dure environ 30 min.
+
+
-+Résultat des tests - Version 9.8 - Calibre 5.0
++Résultat des tests - Version 9.9 - Calibre 5.0
+----------------------------------------------
+
-+La liste de validation de la version 9.8 comprend 2285 tests
++La liste de validation de la version 9.9 comprend 2285 tests
+(seuls les cas-tests ayant de gros fichiers de données ont
+été exclus).
+Il faut compter environ 4-5 heures pour passer tous les tests.
@@ -121,65 +121,63 @@
+La procédure de lancement des cas-tests est décrite dans
+le fichier README_aster.txt. Par exemple ::
+
-+ cd /local01/aster/STA9.8
++ cd /local01/aster/STA9.9
+ /local01/aster/bin/as_run astout.export
+
+
+Le bilan est affiché à la fin du lancement de tous les tests.
+On peut reproduire le bilan des tests en erreur en lancant ::
+
-+ cd /local01/aster/STA9.8
++ cd /local01/aster/STA9.9
+ /local01/aster/bin/as_run --diag --only_nook --astest_dir=astest,resu_test
+
-+Commentaires sur les résultats : consulter la Fiche Qualité de la version 9.8.
++Commentaires sur les résultats : consulter la Fiche Qualité de la version 9.9.
+
+Bilan ::
+
-+ --- Répertoire des cas-tests : /local01/aster9/STA9.8/astest, /local01/aster9/STA9.8/resu_test
-+ Version : 9.8.0
-+ Nombre de cas-tests : 2285
-+ Nombre d'erreurs : 31
-+ - sans fichier .resu : 3
-+ - version incorrecte : 3
-+
-+ fiab001a <F>_ERROR 0.00 0.00 0.00 mefisto
-+ miss03a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss04a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss06a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss06b <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss06c <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss07a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss07b <F>_ERROR 0.00 0.00 0.00 miss3d
-+ miss08a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ plexu01a NO_RESU_FILE 2.11 0.19 2.30 europlexus
-+ plexu02a NO_RESU_FILE 2.03 0.22 2.25 europlexus
-+ sdll136a <F>_ERROR 0.00 0.00 0.00 fiche 14506
-+ sdls118a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ yyyy104k NOOK_TEST_RESU 30.03 0.50 30.53 faible nook
-+ zmat001a NO_RESU_FILE 0.00 0.00 0.00 zmat
-+ zmat001b NO_RESU_FILE 0.00 0.00 0.00 zmat
-+ zmat001c NO_RESU_FILE 0.00 0.00 0.00 zmat
-+ zmat002a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat002b <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat003a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat004a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat005a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat005b <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat006a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zmat007a <F>_ERROR 0.00 0.00 0.00 zmat
-+ zzzz108a <F>_ERROR 0.00 0.00 0.00 miss3d
-+ zzzz108b <F>_ERROR 0.00 0.00 0.00 miss3d
-+ zzzz200b <F>_ERROR 0.00 0.00 0.00 miss3d
-+ zzzz218a <F>_ERROR 0.00 0.00 0.00 ecrevisse
-+ zzzz218b <F>_ERROR 0.00 0.00 0.00 ecrevisse
-+ zzzz218c <F>_ERROR 0.00 0.00 0.00 ecrevisse
-+ ------------ ------------------ ---------- ---------- ----------
-+ 2285 tests 31 erreurs 78283.34 2851.16 81134.50
-+
-+
-+
-+Liste des paquets Calibre 5.0
-+-----------------------------
++ --- Directory of testcases files : /local01/aster/STA9.9/resu_test, /local01/aster/STA9.9/astest
++ Version : 9.9.0
++ Number of test-cases : 2281
++ Number of errors : 29
++ - without .resu file : 5
++ - incorrect version : 5
++
++ fiab001a <F>_ERROR 0.00 0.00 0.00 mefisto
++ miss03a <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss04a <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss06a <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss06b <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss06c <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss07a <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss07b <F>_ERROR 0.00 0.00 0.00 miss3d
++ miss08a <F>_ERROR 0.00 0.00 0.00 miss3d
++ plexu01a NO_RESU_FILE 1.94 0.20 2.14 europlexus
++ plexu02a NO_RESU_FILE 1.97 0.24 2.21 europlexus
++ sdls118a <F>_ERROR 0.00 0.00 0.00 miss3d
++ zmat001a NO_RESU_FILE 0.00 0.00 0.00 zmat
++ zmat001b NO_RESU_FILE 0.00 0.00 0.00 zmat
++ zmat001c NO_RESU_FILE 0.00 0.00 0.00 zmat
++ zmat002a <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat002b <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat003a <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat004a <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat005a <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat005b <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat006a <F>_ERROR 0.00 0.00 0.00 zmat
++ zmat007a <F>_ERROR 0.00 0.00 0.00 zmat
++ zzzz108a <F>_ERROR 0.00 0.00 0.00 miss3d
++ zzzz108b <F>_ERROR 0.00 0.00 0.00 miss3d
++ zzzz200b <F>_ERROR 0.00 0.00 0.00 miss3d
++ zzzz218a <F>_ERROR 0.00 0.00 0.00 ecrevisse
++ zzzz218b <F>_ERROR 0.00 0.00 0.00 ecrevisse
++ zzzz218c <F>_ERROR 0.00 0.00 0.00 ecrevisse
++ ------------ ---------- -------- ------- --------
++ 2281 tests 29 errors 58921.72 2811.42 61733.14
++
++
++
++Liste des paquets Calibre 5.0.3
++-------------------------------
+
+Liste obtenue sur la machine de test en exécutant la commande ::
+
@@ -187,10 +185,10 @@
+
+Paquets ::
+
-+ Souhait=inconnU/Installé/suppRimé/Purgé/H=à garder
-+ | État=Non/Installé/fichier-Config/dépaqUeté/échec-conFig/H=semi-installé
-+ |/ Err?=(aucune)/H=à garder/besoin Réinstallation/X=les deux (État,Err: majuscule=mauvais)
-+ ||/ Nom Version Description
++ Desired=Unknown/Install/Remove/Purge/Hold
++ | Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed
++ |/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
++ ||/ Name Version Description
+ +++-===================-===================-======================================================
+ ii a2ps 4.13b.dfsg.1-1 GNU a2ps - 'Anything to PostScript' converter and pret
+ ii abakus 0.91-1 calculator for KDE
@@ -220,7 +218,7 @@
+ ii anjuta-common 1.2.4a-5 Data files for Anjuta
+ ii ant 1.6.5-6 Java based build tool like make
+ ii ant-optional 1.6.5-6 Java based build tool like make - optional libraries
-+ ii antlr 2.7.6-7 language tool for constructing recognizers, compilers
++ ii antlr 2.7.6-7 language tool for constructing recognizers, compilers
+ ii apbs 0.4.0-2 Adaptive Poisson Boltzmann Solver
+ ii aplus-fsf-el 4.20.2-5 XEmacs lisp for A+ development
+ ii apt 0.6.46.4-0.1+etch1 Advanced front-end for dpkg
@@ -268,7 +266,7 @@
+ ii base-files 4 Debian base system miscellaneous files
+ ii base-passwd 3.5.11 Debian base system master password and group files
+ ii bash 3.1dfsg-8 The GNU Bourne Again SHell
-+ ii basket 0.5.0-6 User-friendly way to run programs and manage links in
++ ii basket 0.5.0-6 User-friendly way to run programs and manage links in
+ ii bazaar 1.4.2-5.3 arch-based distributed revision control system
+ ii bazaar-doc 1.4-1 bazaar revision control system (documentation)
+ ii bc 1.06-20 The GNU bc arbitrary precision calculator language
@@ -284,7 +282,7 @@
+ ii bjam 3.1.13-1 Software build tool
+ ii blackdown-j2sdk1.4 1.4.2+rc1 Java(TM) 2 SDK, Standard Edition, Blackdown
+ ii blacs-mpich-dev 1.1-27 Basic Linear Algebra Comm. Subprograms - Dev. files fo
-+ ii blacs1-mpich 1.1-27 Basic Linear Algebra Comm. Subprograms - Shared libs.
++ ii blacs1-mpich 1.1-27 Basic Linear Algebra Comm. Subprograms - Shared libs.
+ ii blinken 3.5.5-1 KDE version of the Simon Says electronic memory game
+ ii blitz++ 0.9-1.2 C++ template class library for scientific computing
+ ii blop 0.2.8-5 Bandlimited wavetable-based oscillator plugins for LAD
@@ -309,7 +307,7 @@
+ ii cableswig 0.1.0+cvs20060311-1 Generate wrappers for Python and Tcl from C++ code
+ ii calibre-acpi 1.0.0 Meta paquet Calibre ACPI
+ ii calibre-archive-key 20101006 GnuPG archive key of the Calibre repository
-+ ii calibre-atlas3 1.0.2 Méta-paquet Calibre ATLAS
++ ii calibre-atlas3 1.0.2 Méta-paquet Calibre ATLAS
+ ii calibre-autoconf 1.0.0 Meta-paquet Calibre autoconf
+ ii calibre-automake 1.0.0 Meta-paquet Calibre automake
+ ii calibre-base-x 1.0.18 Meta-paquet Calibre Xorg
@@ -331,7 +329,7 @@
+ ii calibre-devel-outil 1.0.13 Meta paquet Calibre outils developpement X
+ ii calibre-eclipse 1.0.3 Meta-paquet Calibre eclipse
+ ii calibre-extras-gui 1.0.9 Meta-paquet Calibre pour les GUI supplementaires
-+ ii calibre-extraswap 1.0.3 Meta-paquet pour augmenter la memoire swap de facon in
++ ii calibre-extraswap 1.0.2 Meta-paquet pour augmenter la memoire swap de facon in
+ ii calibre-extratmp 1.0.2 Meta-paquet pour augmenter la capacite de /tmp
+ ii calibre-flashplugin 1.0.8 Paquet Calibre pour les plugins Flash proprietaires
+ ii calibre-french 1.0.3 Meta-paquet Calibre pour la langue Francaise
@@ -363,6 +361,7 @@
+ ii calibre-msttcorefon 1.1.1 Paquet Calibre des polices TrueType non libres
+ ii calibre-multimedia 1.0.13 Meta-paquet Calibre pour la gestion multimedia
+ ii calibre-nofrench 1.0.7 Meta-paquet Calibre pour les langues etrangeres
++ ii calibre-nvidia185-l 1.0.3 Paquet Calibre pilotes et outils proprietaires Nvidia
+ ii calibre-nvidia185-l 1.0.1 Paquet Calibre pilotes et outils proprietaires Nvidia
+ ii calibre-nvidia185-t 1.0.3 Paquet Calibre des outils proprietaires Nvidia
+ ii calibre-octave 1.0.2 Meta-paquet Calibre Octave
@@ -376,11 +375,11 @@
+ ii calibre-pexsi-rd 1.1.1 Meta-paquet commun aux departements R&D
+ ii calibre-pexsi-rd-am 1.0.61 Paquet de configuration pour le departement AMA
+ ii calibre-pexsi-rd-cc 1.0.5 Installation image CCRT
-+ ii calibre-pexsi-rd-oc 6.0.0 Configuration régionale du paquet ocs.
++ ii calibre-pexsi-rd-oc 6.0.0 Configuration régionale du paquet ocs.
+ ii calibre-pexsi-rd-oc 1.1.6 Configuration du client Octofuss pour la r&d
+ ii calibre-pexsi-rd-po 1.0.6 Installation image Portalis
+ ii calibre-pexsi-rd-pp 1.1.1 Paquet de personnalisation du poste Calibre
-+ ii calibre-pexsi-rd-pu 1.0.1 Configuration régionale du paquet pulse.
++ ii calibre-pexsi-rd-pu 1.0.1 Configuration régionale du paquet pulse.
+ ii calibre-pexsi-rd-vm 1.0.1 Configuration VmWare RD pour Calibre 5
+ ii calibre-plot-nox 1.0.5 Meta-paquet Calibre Plot NO X
+ ii calibre-plot-x 1.0.3 Meta-paquet Calibre outils plot en modalite graphique
@@ -427,8 +426,8 @@
+ ii cogre 1.0pre3-6 Connected Graph Editor
+ ii colorgcc 1.3.2.0-4 Colorizer for GCC warning/error messages
+ ii colormake 0.2-4.3 simple wrapper around make to colorize output
-+ ii comerr-dev 2.1-1.39+1.40-WIP-2 common error description library - headers and static
-+ ii commit-tool 0.4-3 GUI commit tool for various Source Control Management
++ ii comerr-dev 2.1-1.39+1.40-WIP-2 common error description library - headers and static
++ ii commit-tool 0.4-3 GUI commit tool for various Source Control Management
+ ii compilercache 1.0.10-4 a caching wrapper around compilers to speed up compila
+ ii console-common 0.7.69 Basic infrastructure for text console configuration
+ ii console-data 1.01-7 Keymaps, fonts, charset maps, fallback tables for cons
@@ -444,7 +443,7 @@
+ ii cream 0.38-2 VIM macros that make the VIM easier to use for beginne
+ ii cron 3.0pl1-100 management of regular background processing
+ ii cscope 15.6-2+etch1 Interactively examine a C program source
-+ ii csh 20060813-1 Shell with C-like syntax, standard login shell on BSD
++ ii csh 20060813-1 Shell with C-like syntax, standard login shell on BSD
+ ii cups-pdf 2.4.2-3 PDF printer for CUPS
+ ii cupsys 1.2.7-4+etch9+c5sec Common UNIX Printing System(tm) - server
+ ii cupsys-bsd 1.2.7-4+etch9+c5sec Common UNIX Printing System(tm) - BSD commands
@@ -563,7 +562,7 @@
+ ii ekiga 2.0.3-6 H.323 and SIP compatible VOIP client
+ ii electric-fence 2.1.14.1 A malloc(3) debugger
+ ii emacs21 21.4a+1-3etch1 The GNU Emacs editor
-+ ii emacs21-bin-common 21.4a+1-3etch1 The GNU Emacs editor's shared, architecture dependent
++ ii emacs21-bin-common 21.4a+1-3etch1 The GNU Emacs editor's shared, architecture dependent
+ ii emacs21-common 21.4a+1-3etch1 The GNU Emacs editor's shared, architecture independen
+ ii emacsen-common 1.4.17 Common facilities for all emacsen
+ ii enigmail 0.94.2-2 GnuPG support for Icedove
@@ -592,7 +591,7 @@
+ ii esvn-doc 0.6.11+1-2 documentation for esvn
+ ii ethtool 5-1 display or change ethernet card settings
+ ii eukleides 0.9.2-3 a Euclidean geometry drawing language
-+ ii euro-support 1.36 Help setting up euro character support in your Debian
++ ii euro-support 1.36 Help setting up euro character support in your Debian
+ ii evince 0.4.0-5 Document (postscript, pdf) viewer
+ ii evolution 2.6.3-6etch2 groupware suite with mail client and organizer
+ ii evolution-common 2.6.3-6etch2 architecture independent files for Evolution
@@ -612,7 +611,7 @@
+ ii eyesapplet 3.5.5-3 eyes applet for KDE
+ ii f2c 20050501-1 A FORTRAN 77 to C/C++ translator.
+ ii fakeroot 1.5.10 Gives a fake root environment
-+ ii fast-user-switch-ap 2.14.2-1 Applet for the GNOME panel providing a menu to switch
++ ii fast-user-switch-ap 2.14.2-1 Applet for the GNOME panel providing a menu to switch
+ ii fastjar 4.1.1-21 Jar creation utility
+ ii fftw2 2.1.3-20 library for computing Fast Fourier Transforms
+ ii fftw3 3.1.2-1 library for computing Fast Fourier Transforms
@@ -708,7 +707,7 @@
+ ii geda-symbols 20061020-1 Symbols for GNU EDA -- Electronics design software
+ ii geda-utils 20061020-2 GNU EDA -- Electronics design software -- utilities
+ ii gedit 2.14.4-8 official text editor of the GNOME desktop environment
-+ ii gedit-common 2.14.4-8 official text editor of the GNOME desktop environment
++ ii gedit-common 2.14.4-8 official text editor of the GNOME desktop environment
+ ii genisoimage 1.1.2-1 Creates ISO-9660 CD-ROM filesystem images
+ ii geomview 1.8.1-14 interactive geometry viewing program
+ ii gettext 0.16.1-1 GNU Internationalization utilities
@@ -739,7 +738,7 @@
+ ii gjdoc 0.7.7-7 documentation generation framework for java source fil
+ ii gkrellm 2.2.9-1 The GNU Krell Monitors
+ ii gksu 2.0.0-1 graphical frontend to su
-+ ii glabels 2.1.3-1 label, business card and media cover creation program
++ ii glabels 2.1.3-1 label, business card and media cover creation program
+ ii glabels-data 2.1.3-1 data files for gLabels
+ ii glade-common 2.12.1-7 Common files for GTK+ 2 User Interface Builder
+ ii glade-gnome 2.12.1-7 GTK+ 2 User Interface Builder (with GNOME 2 support)
@@ -767,7 +766,7 @@
+ ii gnome-core 2.14.3.6 The GNOME Desktop Environment -- essential components
+ ii gnome-cups-manager 0.31-3 CUPS printer admin tool for GNOME
+ ii gnome-desktop-data 2.14.3-2 Common files for GNOME 2 desktop apps
-+ ii gnome-doc-utils 0.6.1-3 a collection of documentation utilities for the Gnome
++ ii gnome-doc-utils 0.6.1-3 a collection of documentation utilities for the Gnome
+ ii gnome-icon-theme 2.14.2-2 GNOME Desktop icon theme
+ ii gnome-keyring 0.6.0-3 GNOME keyring services (daemon and tools)
+ ii gnome-keyring-manag 2.16.0-2 keyring management program for the GNOME desktop
@@ -932,11 +931,11 @@
+ ii inkscape 0.44.1-1 vector-based drawing program
+ ii installation-report 2.29 system installation report
+ ii intel-icce100026 10.0.026-1 Intel(R) C++ Compiler for applications running on Inte
-+ ii intel-iforte100026 10.0.026-1 Intel(R) Fortran Compiler for applications running on
++ ii intel-iforte100026 10.0.026-1 Intel(R) Fortran Compiler for applications running on
+ ii intltool 0.35.0-3 Utility scripts for internationalizing XML
+ ii intltool-debian 0.35.0+20060710.1 Help i18n of RFC822 compliant config files
-+ ii iproute 20061002-3 Professional tools to control the networking in Linux
-+ ii iproute-doc 20061002-3 Professional tools to control the networking in Linux
++ ii iproute 20061002-3 Professional tools to control the networking in Linux
++ ii iproute-doc 20061002-3 Professional tools to control the networking in Linux
+ ii iptables 1.3.6.0debian1-5 administration tools for packet filtering and NAT
+ ii iputils-arping 20020927-6 Tool to send ICMP echo requests to an ARP address
+ ii iputils-ping 20020927-6 Tools to test the reachability of network hosts
@@ -953,7 +952,7 @@
+ ii jikes 1.22-6 Fast Java compiler adhering to language and VM specifi
+ ii jikes-gij 1.22-6 Wrapper for jikes using GNU GIJ classes
+ ii joe 3.5-1.1 user friendly full screen text editor
-+ ii jove 4.16.0.70-3 Jonathan's Own Version of Emacs - a compact, powerful
++ ii jove 4.16.0.70-3 Jonathan's Own Version of Emacs - a compact, powerful
+ ii jpilot 0.99.9.2-1 graphical app. to modify the contents of your Palm Pil
+ ii jpilot-plugins 0.99.9.2-1 plugins for jpilot (Palm Pilot desktop)
+ ii juk 3.5.5-2 music organizer and player for KDE
@@ -1194,7 +1193,7 @@
+ ii kompare 3.5.5-3 a KDE GUI for viewing differences between files
+ ii kompose 0.5.4-1 full screen task manager for KDE
+ ii konq-plugins 3.5.5-1 plugins for Konqueror, the KDE file/web/doc browser
-+ ii konqueror 3.5.5a.dfsg.1-6etch KDE's advanced file manager, web browser and document
++ ii konqueror 3.5.5a.dfsg.1-6etch KDE's advanced file manager, web browser and document
+ ii konqueror-nsplugins 3.5.5a.dfsg.1-6etch Netscape plugin support for Konqueror
+ ii konquest 3.5.5-1 KDE based GNU-Lactic Konquest game
+ ii konserve 0.10.3-3 KDE system tray application that performs periodic bac
@@ -1357,7 +1356,7 @@
+ ii libacl1 2.2.41-1 Access control list shared library
+ ii libacl1-dev 2.2.41-1 Access control list static libraries and headers
+ ii libadplug0c2a 2.0.1-2 free AdLib sound library
-+ ii libagg-dev 2.4+20060719-3 The AntiGrain Geometry graphical toolkit (development
++ ii libagg-dev 2.4+20060719-3 The AntiGrain Geometry graphical toolkit (development
+ ii libaiksaurus-1.2-0c 1.2.1+dev-0.12-3 an English-language thesaurus (development)
+ ii libaiksaurus-1.2-da 1.2.1+dev-0.12-3 an English-language thesaurus (data)
+ ii libaio-dev 0.3.106-3 linux kernel aio access library - development files
@@ -1370,7 +1369,7 @@
+ ii libapt-pkg-perl 0.1.20 Perl interface to libapt-pkg
+ ii libarchive-tar-perl 1.30-2 Archive::Tar - manipulate tar files in perl
+ ii libarpack++2c2a 2.2-9 Object-oriented version of the ARPACK package (runtime
-+ ii libarpack2 2.1-8 Fortran77 subroutines to solve large scale eigenvalue
++ ii libarpack2 2.1-8 Fortran77 subroutines to solve large scale eigenvalue
+ ii libart-2.0-2 2.3.17-1 Library of functions for 2D graphics - runtime files
+ ii libart-2.0-dev 2.3.17-1 Library of functions for 2D graphics - development fil
+ ii libart2 1.4.2-34 The GNOME canvas widget - runtime files
@@ -1381,7 +1380,7 @@
+ ii libarts1-xine 3.5.5-2 aRts plugin enabling xine support
+ ii libarts1c2a 1.5.5-1 aRts sound system core components
+ ii libartsc0 1.5.5-1 aRts sound system C support library
-+ ii libartsc0-dev 1.5.5-1 development files for the aRts sound system C support
++ ii libartsc0-dev 1.5.5-1 development files for the aRts sound system C support
+ ii libasound2 1.0.13-2 ALSA library
+ ii libasound2-dev 1.0.13-2 ALSA library development files
+ ii libaspell-dev 0.60.4-4 Development files for applications with GNU Aspell sup
@@ -1434,8 +1433,8 @@
+ ii libboost-dbg 1.33.1-10 Boost C++ Libraries with debug symbols
+ ii libboost-dev 1.33.1-10 Boost C++ Libraries development files
+ ii libboost-doc 1.33.1-10 Boost.org libraries documentation
-+ ii libboost-filesystem 1.33.1-10 filesystem operations (portable paths, iteration over
-+ ii libboost-filesystem 1.33.1-10 filesystem operations (portable paths, iteration over
++ ii libboost-filesystem 1.33.1-10 filesystem operations (portable paths, iteration over
++ ii libboost-filesystem 1.33.1-10 filesystem operations (portable paths, iteration over
+ ii libboost-graph-dev 1.33.1-10 generic graph components and algorithms in C++
+ ii libboost-graph1.33. 1.33.1-10 generic graph components and algorithms in C++
+ ii libboost-iostreams- 1.33.1-10 Boost.Iostreams Library development files
@@ -1537,9 +1536,9 @@
+ ii libdbus-1-3 1.0.2-1+etch3+c5-2 simple interprocess messaging system
+ ii libdbus-1-dev 1.0.2-1+etch3+c5-2 simple interprocess messaging system (development head
+ ii libdbus-glib-1-2 0.71-3 simple interprocess messaging system (GLib-based share
-+ ii libdbus-qt-1-1c2 0.62.git.20060814-2 simple interprocess messaging system (Qt-based shared
-+ ii libdc1394-13 1.1.0-3+b1 high level programming interface for IEEE1394 digital
-+ ii libdc1394-13-dev 1.1.0-3+b1 high level programming interface for IEEE1394 digital
++ ii libdbus-qt-1-1c2 0.62.git.20060814-2 simple interprocess messaging system (Qt-based shared
++ ii libdc1394-13 1.1.0-3+b1 high level programming interface for IEEE1394 digital
++ ii libdc1394-13-dev 1.1.0-3+b1 high level programming interface for IEEE1394 digital
+ ii libdebian-installer 0.50etch1 Library of some extra debian-installer functions
+ ii libdebian-installer 0.50etch1 Library of common debian-installer functions
+ ii libdebug0 0.4.2 Memory leak detection system and logging library
@@ -1559,7 +1558,7 @@
+ ii libdockapp2 0.5.0-1.3 Window Maker Dock App support (shared library)
+ ii libdrm2 2.0.2-0.1 Userspace interface to kernel DRM services -- runtime
+ ii libdts-dev 0.0.2-svn-1 development files for libdts
-+ ii libdv4 1.0.0-1 software library for DV format digital video (runtime
++ ii libdv4 1.0.0-1 software library for DV format digital video (runtime
+ ii libdvbpsi4 0.1.5-2 library for MPEG TS and DVB PSI tables decoding and ge
+ ii libdvdcss2 1.2.9-0.0 Simple foundation for reading DVDs - runtime libraries
+ ii libdvdcss2-dev 1.2.9-0.0 Simple foundation for reading DVDs - devel files
@@ -1579,7 +1578,7 @@
+ ii libegroupwise1.2-10 1.6.3-5etch3 Client library for accessing groupwise POA through SOA
+ ii libelfg0 0.8.6-3 an ELF object file access library
+ ii libenchant1c2a 1.3.0-2 a wrapper library for various spell checker engines
-+ ii liberror-perl 0.15-8 Perl module for error/exception handling in an OO-ish
++ ii liberror-perl 0.15-8 Perl module for error/exception handling in an OO-ish
+ ii libesd0 0.2.36-3 Enlightened Sound Daemon - Shared libraries
+ ii libesd0-dev 0.2.36-3 Enlightened Sound Daemon - Development files
+ ii libeurodec1 2005.dfsg-2 [Physics] Monte Carlo library for quark and heavy lept
@@ -1664,7 +1663,7 @@
+ ii libgecode-doc 1.3.1-1 generic constraint development environment
+ ii libgecode7-dev 1.3.1-1 generic constraint development environment
+ ii libgecode8 1.3.1-1 generic constraint development environment
-+ ii libgeda-dev 20061020-3 GNU EDA -- Electronics design software -- development
++ ii libgeda-dev 20061020-3 GNU EDA -- Electronics design software -- development
+ ii libgeda20 20061020-3 GNU EDA -- Electronics design software -- library file
+ ii libgef-java 0.11.999.0.11.3M10- Graph Editing Framework written entirely in Java
+ ii libgenders0 1.4-1-1 C library for parsing and querying a genders database
@@ -1696,7 +1695,7 @@
+ ii libglib2.0-dev 2.12.4-2+etch1 Development files for the GLib library
+ ii libglib2.0-doc 2.12.4-2+etch1 Documentation files for the GLib library
+ ii libglibmm-2.4-1c2a 2.12.0-1 C++ wrapper for the GLib toolkit (shared libraries)
-+ ii libglpk0 4.11-2 linear programming kit (shared libraries for use with
++ ii libglpk0 4.11-2 linear programming kit (shared libraries for use with
+ ii libglu1-mesa 6.5.1-0.6 The OpenGL utility library (GLU)
+ ii libglu1-mesa-dev 6.5.1-0.6 The OpenGL utility library -- development support file
+ ii libglu1-xorg-dev 7.1.0-19 transitional package for Debian etch
@@ -1734,7 +1733,7 @@
+ ii libgnomeprint2.2-0 2.12.1-7 The GNOME 2.2 print architecture - runtime files
+ ii libgnomeprint2.2-da 2.12.1-7 The GNOME 2.2 print architecture - data files
+ ii libgnomeprint2.2-de 2.12.1-7 The GNOME 2.2 print architecture - development files
-+ ii libgnomeprintui2.2- 2.12.1-4 GNOME 2.2 print architecture User Interface - runtime
++ ii libgnomeprintui2.2- 2.12.1-4 GNOME 2.2 print architecture User Interface - runtime
+ ii libgnomeprintui2.2- 2.12.1-4 GNOME 2.2 print architecture User Interface - common f
+ ii libgnomeprintui2.2- 2.12.1-4 GNOME 2.2 print architecture User Interface - devel fi
+ ii libgnomesupport0 1.4.2-34 The GNOME libraries (Support libraries)
@@ -1758,8 +1757,8 @@
+ ii libgnutls13 1.4.4-3+etch5 the GNU TLS library - runtime library
+ ii libgoffice-1-2 0.2.1-4 Document centric objects library - runtime files
+ ii libgoffice-1-common 0.2.1-4 Document centric objects library - common files
-+ ii libgpg-error-dev 1.4-1 library for common error values and messages in GnuPG
-+ ii libgpg-error0 1.4-1 library for common error values and messages in GnuPG
++ ii libgpg-error-dev 1.4-1 library for common error values and messages in GnuPG
++ ii libgpg-error0 1.4-1 library for common error values and messages in GnuPG
+ ii libgpgme11 1.1.2-5 GPGME - GnuPG Made Easy
+ ii libgphoto2-2 2.2.1-16 gphoto2 digital camera library
+ ii libgphoto2-2-dev 2.2.1-16 gphoto2 digital camera library (development files)
@@ -1772,7 +1771,7 @@
+ ii libgrafx11-1-dev 2005.dfsg-5 Cernlib library interface to X11 and PostScript (devel
+ ii libgraphics-magick- 1.1.7-13+etch1 format-independent image processing - perl interface
+ ii libgraphicsmagick++ 1.1.7-13+etch1 format-independent image processing - C++ shared libra
-+ ii libgraphicsmagick++ 1.1.7-13+etch1 format-independent image processing - C++ development
++ ii libgraphicsmagick++ 1.1.7-13+etch1 format-independent image processing - C++ development
+ ii libgraphicsmagick1 1.1.7-13+etch1 format-independent image processing - C shared library
+ ii libgraphicsmagick1- 1.1.7-13+etch1 format-independent image processing - C development fi
+ ii libgsf-1-114 1.14.3-1 Structured File Library - runtime version
@@ -1825,13 +1824,13 @@
+ ii libhdf4g-run 4.1r4-18.1 The Hierarchical Data Format library -- runtime packag
+ ii libhdf5-doc 1.6.5-3 Hierarchical Data Format 5 (HDF5) - Documentation
+ ii libhdf5-serial-1.6. 1.6.5-3 Hierarchical Data Format 5 (HDF5) - runtime files - se
-+ ii libhdf5-serial-dev 1.6.5-3 Hierarchical Data Format 5 (HDF5) - development files
++ ii libhdf5-serial-dev 1.6.5-3 Hierarchical Data Format 5 (HDF5) - development files
+ ii libherwig59-2 2005.dfsg-2 [Physics] Monte Carlo event generator simulating hadro
+ ii libherwig59-2-dev 2005.dfsg-2 [Physics] Monte Carlo event generator for hadrons (dev
+ ii libhsqldb-java 1.8.0.7-1etch1 Java SQL database engine
+ ii libhtml-format-perl 2.04-1 Format HTML syntax trees
+ ii libhtml-parser-perl 3.55-1+etch1 A collection of modules that parse HTML text documents
-+ ii libhtml-tableextrac 2.10-1 module for extracting the content contained in tables
++ ii libhtml-tableextrac 2.10-1 module for extracting the content contained in tables
+ ii libhtml-tagset-perl 3.10-2 Data tables pertaining to HTML
+ ii libhtml-tree-perl 3.19.01-2 represent and create HTML syntax trees
+ ii libibverbs1 1.1.2-2 A library for direct userspace use of RDMA (InfiniBand
@@ -1852,12 +1851,12 @@
+ ii libijs-0.35 0.35-3 IJS raster image transport protocol: shared library
+ ii libimlib2 1.3.0.0debian1-4+et powerful image loading and rendering library
+ ii libindex0 3.5.5.dfsg.1-6 KDE indexing library
-+ ii libio-socket-ssl-pe 1.01-1 Perl module implementing object oriented interface to
++ ii libio-socket-ssl-pe 1.01-1 Perl module implementing object oriented interface to
+ ii libio-string-perl 1.08-2 Emulate IO::File interface for in-core strings
+ ii libio-stringy-perl 2.110-2 Perl5 modules for IO from scalars and arrays
+ ii libio-zlib-perl 1.04-1 IO:: style interface to Compress::Zlib
+ ii libiodbc2 3.52.4-5 iODBC Driver Manager
-+ ii libisajet758-2 2005.dfsg-2 [Physics] Monte Carlo generator for proton / electron
++ ii libisajet758-2 2005.dfsg-2 [Physics] Monte Carlo generator for proton / electron
+ ii libisajet758-2-dev 2005.dfsg-2 [Physics] Monte Carlo generator for proton/electron re
+ ii libisc11 9.3.4-2etch6 ISC Shared Library used by BIND
+ ii libisccc0 9.3.4-2etch6 Command Channel Library used by BIND
@@ -1870,7 +1869,7 @@
+ ii libjama-dev 1.2.4-2 C++ Linear Algebra Package
+ ii libjasper-1.701-1 1.701.0-2.1 The JasPer JPEG-2000 runtime library
+ ii libjasper-1.701-dev 1.701.0-2.1 Development files for the JasPer JPEG-2000 library
-+ ii libjaxp1.3-java 1.3.03-4 Java XML parser and transformer APIs (DOM, SAX, JAXP,
++ ii libjaxp1.3-java 1.3.03-4 Java XML parser and transformer APIs (DOM, SAX, JAXP,
+ ii libjcode-pm-perl 2.06-1 Perl extension interface to convert Japanese text
+ ii libjinglebase0.3-0 0.3.9-1 Libjingle base library
+ ii libjinglep2p0.3-0 0.3.9-1 Libjingle p2p
@@ -1921,7 +1920,7 @@
+ ii liblog4cxx9c2a 0.9.7-6 A logging library for C++
+ ii liblog4j1.2-java 1.2.13-2 Logging library for java
+ ii liblogfile-rotate-p 1.04-3 Perl module to rotate logfiles
-+ ii libloki-dev 0.1.5-2 a C++ library of generic design patterns (development
++ ii libloki-dev 0.1.5-2 a C++ library of generic design patterns (development
+ ii libloki-doc 0.1.5-2 a C++ library of generic design patterns (documentatio
+ ii libloki0.1.5 0.1.5-2 a C++ library of generic design patterns
+ ii libloudmouth1-0 1.1.4-2 Lightweight C Jabber library
@@ -2019,7 +2018,7 @@
+ ii libnautilus-burn3 2.14.3-8+b1 Nautilus Burn Library - runtime version
+ ii libnautilus-extensi 2.14.3-11+b1 libraries for nautilus components - development versio
+ ii libnautilus-extensi 2.14.3-11+b1 libraries for nautilus components - runtime version
-+ ii libncp 2.2.6-4 shared library used by programs that use NetWare Core
++ ii libncp 2.2.6-4 shared library used by programs that use NetWare Core
+ ii libncurses5 5.5-5 Shared libraries for terminal handling
+ ii libncurses5-dev 5.5-5 Developer's libraries and docs for ncurses
+ ii libncursesw5 5.5-5 Shared libraries for terminal handling (wide character
@@ -2078,7 +2077,7 @@
+ ii libpacklib1 2005.dfsg-5 core Cernlib library
+ ii libpacklib1-dev 2005.dfsg-5 core Cernlib library (development files)
+ ii libpacklib1-lesstif 2005.dfsg-5 Cernlib graphical user interface library
-+ ii libpacklib1-lesstif 2005.dfsg-5 Cernlib graphical user interface library (development
++ ii libpacklib1-lesstif 2005.dfsg-5 Cernlib graphical user interface library (development
+ ii libpalm-perl 1.3.0-6 Perl 5 modules for manipulating pdb and prc database f
+ ii libpam-modules 0.79-5+etch1 Pluggable Authentication Modules for PAM
+ ii libpam-runtime 0.79-5+etch1 Runtime support for the PAM library
@@ -2147,7 +2146,7 @@
+ ii libpvm3 3.4.5-7 Parallel Virtual Machine - shared libraries
+ ii libpythonize0 0.4.0-3 Python packages to support KDE applications (library)
+ ii libqhull-dev 2003.1-2 Calculate convex hulls and related structures (develop
-+ ii libqhull5 2003.1-2 Calculate convex hulls and related structures (shared
++ ii libqhull5 2003.1-2 Calculate convex hulls and related structures (shared
+ ii libqscintilla-dev 1.6-2 Qt source code editing component - development files
+ ii libqscintilla-doc 1.6-2 Qt source code editing component - documentation
+ ii libqscintilla6 1.6-2 Qt source code editing component based on Scintilla
@@ -2196,7 +2195,7 @@
+ ii libsane 1.0.18-5 API library for scanners
+ ii libsasl2 2.1.22.dfsg1-8+etch Authentication abstraction library
+ ii libsasl2-2 2.1.22.dfsg1-8+etch Authentication abstraction library
-+ ii libsasl2-dev 2.1.22.dfsg1-8+etch Development files for SASL authentication abstraction
++ ii libsasl2-dev 2.1.22.dfsg1-8+etch Development files for SASL authentication abstraction
+ ii libsasl2-modules 2.1.22.dfsg1-8+etch Pluggable Authentication Modules for SASL
+ ii libscrollkeeper0 0.3.14-13 Library to load .omf files (runtime files)
+ ii libsdl-erlang 0.96.0626-4 Erlang bindings to the Simple Direct Media Library
@@ -2253,7 +2252,7 @@
+ ii libstlport5.0 5.0.2-12 STLport C++ class library
+ ii libstlport5.1 5.0.99rc2-1 STLport C++ class library
+ ii libstroke0 0.5.1-5 mouse strokes library -- runtime files
-+ ii libsundials-serial0 2.2.0-3 SUit of Nonlinear and DIfferential/ALgebraic equation
++ ii libsundials-serial0 2.2.0-3 SUit of Nonlinear and DIfferential/ALgebraic equation
+ ii libsuperlu3 3.0-5 Direct solution of large, sparse systems of linear equ
+ ii libsuperlu3-dev 3.0-5 Direct solution of large, sparse systems of linear equ
+ ii libsvga1 1.4.3-24 console SVGA display libraries
@@ -2314,7 +2313,7 @@
+ ii libungif4g 4.1.4-4 shared library for GIF images
+ ii libunicode-map-perl 0.112-10 Perl module for mapping charsets from and to UTF16 Uni
+ ii libunicode-map8-per 0.12-3 Perl module to map 8bit character sets to Unicode
-+ ii libunicode-maputf8- 1.11-2 Perl module for conversing between any character sets
++ ii libunicode-maputf8- 1.11-2 Perl module for conversing between any character sets
+ ii libunicode-string-p 2.09-1 Perl modules for Unicode strings
+ ii libunshield0 0.5-3 library to extracts CAB files from InstallShield insta
+ ii liburi-perl 1.35-2 Manipulates and accesses URI strings
@@ -2332,10 +2331,10 @@
+ ii libvorbisfile3 1.1.2.dfsg-1.4+etch The Vorbis General Audio Compression Codec
+ ii libvte-common 0.12.2-5 Terminal emulator widget for GTK+ 2.0 - common files
+ ii libvte4 0.12.2-5 Terminal emulator widget for GTK+ 2.0 - runtime files
-+ ii libvtk5 5.0.2-4 Visualization Toolkit - A high level 3D visualization
++ ii libvtk5 5.0.2-4 Visualization Toolkit - A high level 3D visualization
+ ii libvtk5-dev 5.0.2-4 VTK header files for building C++ code
-+ ii libvtk5-qt3 5.0.2-4 Visualization Toolkit - A high level 3D visualization
-+ ii libvtk5-qt3-dev 5.0.2-4 Visualization Toolkit - A high level 3D visualization
++ ii libvtk5-qt3 5.0.2-4 Visualization Toolkit - A high level 3D visualization
++ ii libvtk5-qt3-dev 5.0.2-4 Visualization Toolkit - A high level 3D visualization
+ ii libwavpack0 4.32-2 an audio codec (lossy and lossless) - library
+ ii libwine 0.9.34-1 Windows API Implementation (Library)
+ ii libwine-alsa 0.9.34-1 Windows API Implementation (ALSA Sound Module)
@@ -2352,7 +2351,7 @@
+ ii libwv2-1c2 0.2.3-1 a library for accessing Microsoft Word documents
+ ii libwww-perl 5.805-1 WWW client/server library for Perl (aka LWP)
+ ii libwww-search-perl 2.46-1 Perl modules which provide an API to WWW search engine
-+ ii libwxbase2.6-0 2.6.3.2.1.5+etch1 wxBase library (runtime) - non-GUI support classes of
++ ii libwxbase2.6-0 2.6.3.2.1.5+etch1 wxBase library (runtime) - non-GUI support classes of
+ ii libwxgtk2.6-0 2.6.3.2.1.5+etch1 wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime
+ ii libx11-6 1.0.3-7 X11 client-side library
+ ii libx11-data 1.0.3-7 X11 client-side library
@@ -2454,8 +2453,11 @@
+ ii liferea-xulrunner 1.0.27-2 xulrunner-based rendering library for Liferea
+ ii lintian 1.23.28+etch1 Debian package checker
+ ii linux-doc-2.6.26 2.6.26-25lenny1+c5+ Linux kernel specific documentation for version 2.6.26
++ ii linux-headers-2.6.2 2.6.26-14 Header files for Linux 2.6.26-1-amd64
++ ii linux-headers-2.6.2 2.6.26-14 Common header files for Linux 2.6.26-1
+ ii linux-headers-2.6.2 2.6.26-25lenny1+c5+ Header files for Linux 2.6.26-2-amd64
+ ii linux-headers-2.6.2 2.6.26-25lenny1+c5+ Common header files for Linux 2.6.26-2
++ ii linux-image-2.6.26- 2.6.26-14 Linux 2.6.26 image on AMD64
+ ii linux-image-2.6.26- 2.6.26-25lenny1+c5+ Linux 2.6.26 image on AMD64
+ ii linux-kbuild-2.6.26 2.6.26-4~c5+1 Kbuild infrastructure for Linux 2.6.26
+ ii linux-kernel-header 2.6.18-7 Linux Kernel Headers for development
@@ -2620,7 +2622,7 @@
+ ii octave2.9-htmldoc 2.9.9-8etch1 HTML documentation on the GNU Octave language (2.9 bra
+ ii octave2.9-info 2.9.9-8etch1 GNU Info documentation on the GNU Octave language (2.9
+ ii octofuss-client 2.0.6 OctoFuss client
-+ ii odbcinst1debian1 2.2.11-13 Support library and helper program for accessing odbc
++ ii odbcinst1debian1 2.2.11-13 Support library and helper program for accessing odbc
+ ii ogre-doc 1.0.6-1.4 Object-oriented Graphics Rendering Engine (documentati
+ ii ogre-tools 1.0.6-1.4 Object-oriented Graphics Rendering Engine (tools)
+ ii openbsd-inetd 0.20050402-6 The OpenBSD Internet Superserver
@@ -2635,12 +2637,12 @@
+ ii openoffice.org-evol 2.0.4.dfsg.2-7etch9 Evolution Addressbook support for OpenOffice.org
+ ii openoffice.org-gcj 2.0.4.dfsg.2-7etch9 OpenOffice.orgs Java libraries (native for use with GI
+ ii openoffice.org-gnom 2.0.4.dfsg.2-7etch9 GNOME Integration for OpenOffice.org (VFS, GConf)
-+ ii openoffice.org-gtk 2.0.4.dfsg.2-7etch9 GTK Integration for OpenOffice.org (Widgets, Dialogs,
++ ii openoffice.org-gtk 2.0.4.dfsg.2-7etch9 GTK Integration for OpenOffice.org (Widgets, Dialogs,
+ ii openoffice.org-help 2.0.4.dfsg.2-7etch9 English_american help for OpenOffice.org
+ ii openoffice.org-help 2.0.4.dfsg.2-7etch9 French help for OpenOffice.org
+ ii openoffice.org-impr 2.0.4.dfsg.2-7etch9 OpenOffice.org office suite - presentation
+ ii openoffice.org-java 2.0.4.dfsg.2-7etch9 OpenOffice.org office suite Java support arch. indepen
-+ ii openoffice.org-kde 2.0.4.dfsg.2-7etch9 KDE Integration for OpenOffice.org (Widgets, Dialogs,
++ ii openoffice.org-kde 2.0.4.dfsg.2-7etch9 KDE Integration for OpenOffice.org (Widgets, Dialogs,
+ ii openoffice.org-l10n 2.0.4.dfsg.2-7etch9 French language package for OpenOffice.org
+ ii openoffice.org-math 2.0.4.dfsg.2-7etch9 OpenOffice.org office suite - equation editor
+ ii openoffice.org-thes 2.0.4~rc1-3 English Thesaurus for OpenOffice.org
@@ -2713,7 +2715,7 @@
+ ii ppp 2.4.4rel-8 Point-to-Point Protocol (PPP) daemon
+ ii prcs 1.3.3-8 The Project Revision Control System
+ ii prcs-visualtree 1.3.3-8 Visualize PRCS projects in a graph
-+ ii preview-latex-style 11.83-6 LaTeX style files for editor embedded preview of some
++ ii preview-latex-style 11.83-6 LaTeX style files for editor embedded preview of some
+ ii printconf 0.7.7 automatically configures USB and parallel printers wit
+ ii procmail 3.22-16 Versatile e-mail processor
+ ii procps 3.2.7-3 /proc file system utilities
@@ -2799,7 +2801,7 @@
+ ii python-gdchart2 0.beta1-3.3 Python OO interface to GDChart
+ ii python-gdchart2-doc 0.beta1-3.3 Python OO interface to GDChart - docs
+ ii python-gendoc 0.73-11 Documentation generation from Python source files
-+ ii python-glade-1.2 0.6.12-8 Put a bit of python code behind interfaces built with
++ ii python-glade-1.2 0.6.12-8 Put a bit of python code behind interfaces built with
+ ii python-glade2 2.8.6-8 GTK+ bindings: Glade support
+ ii python-gmenu 2.16.1-3 an implementation of the freedesktop menu specificatio
+ ii python-gnome2 2.12.4-6 Python bindings for the GNOME desktop environment
@@ -2907,7 +2909,7 @@
+ ii python-reportlab-do 2.0dfsg-1 Documentation for the ReportLab Python library (PDF fo
+ ii python-roman 0.4-3 A module for generating/analyzing Roman numerals
+ ii python-rpy 1.0~rc1-2 Python interface to the GNU R language and environment
-+ ii python-rpy-doc 1.0~rc1-2 Python interface to the GNU R language (documentation
++ ii python-rpy-doc 1.0~rc1-2 Python interface to the GNU R language (documentation
+ ii python-scientific 2.4.11-1 Python modules useful for scientific computing
+ ii python-scientific-d 2.4.11-1 Python modules useful for scientific computing
+ ii python-scipy 0.5.2-0.1 scientific tools for Python
@@ -2939,7 +2941,7 @@
+ ii python-twisted-name 0.3.0-1 A DNS protocol implementation with client and server
+ ii python-twisted-news 0.2.0-1 An NNTP protocol implementation with client and server
+ ii python-twisted-runn 0.2.0-1.1 Process management, including an inetd server
-+ ii python-twisted-web 0.6.0-1 An HTTP protocol implementation together with clients
++ ii python-twisted-web 0.6.0-1 An HTTP protocol implementation together with clients
+ ii python-twisted-word 0.4.0-2.1 Chat and Instant Messaging
+ ii python-tz 2006p-0.1 Python version of the Olson timezone database
+ ii python-uncertainiti 0.002-3 Python module for working with uncertain numbers
@@ -2990,7 +2992,7 @@
+ ii qt4-qtconfig 4.2.1-2+etch1 Qt 4 configuration tool
+ ii quanta 3.5.5-1 web development environment for KDE
+ ii quanta-data 3.5.5-1 data files for Quanta Plus web development environment
-+ ii quantlib-python 0.3.13-3 Python bindings for the Quantlib Quantitative Finance
++ ii quantlib-python 0.3.13-3 Python bindings for the Quantlib Quantitative Finance
+ ii quota 3.14-7 implementation of the disk quota system
+ ii r-base 2.4.0.20061125-1 GNU R statistical computing language and environment
+ ii r-base-core 2.4.0.20061125-1 GNU R core of statistical computing language and envir
@@ -3025,7 +3027,7 @@
+ ii r-cran-gmodels 2.13.1-1 GNU R package with tools for model fitting by Greg War
+ ii r-cran-gplots 2.3.2-1 GNU R package with tools for plotting data by Greg War
+ ii r-cran-gregmisc 2.1.1-1 GNU R package with miscellaneous functions by Greg War
-+ ii r-cran-gtools 2.3.0-1 GNU R package with R programming tools by Greg Warnes
++ ii r-cran-gtools 2.3.0-1 GNU R package with R programming tools by Greg Warnes
+ ii r-cran-hdf5 1.6.4-1 GNU R package interfacing the NCSA HDF5 library
+ ii r-cran-hmisc 3.1.2-1 GNU R miscellaneous functions by Frank Harrell
+ ii r-cran-its 1.1.4-2 GNU R package for handling irregular time series
@@ -3050,7 +3052,7 @@
+ ii r-cran-qtl 1.05-2-1 GNU R package for genetic marker linkage analysis
+ ii r-cran-quadprog 1.4.10-1 GNU R package for solving quadratic programming proble
+ ii r-cran-rcmdr 1.2-2-1 GNU R platform-independent basic-statistics GUI
-+ ii r-cran-relimp 0.9-7-1 GNU R package for inference on relative importance of
++ ii r-cran-relimp 0.9-7-1 GNU R package for inference on relative importance of
+ ii r-cran-rgl 0.68-1 GNU R package for three-dimensional visualisation usin
+ ii r-cran-rgtk2 2.8.6-1 GNU R binding for Gtk2
+ ii r-cran-rmpi 0.5-3-1 GNU R package interfacing MPI libraries for distribute
@@ -3119,9 +3121,9 @@
+ ii scalapack-test-comm 1.7.4-2 Test data for ScaLAPACK testers
+ ii scalapack1-mpich 1.7.4-2 Scalable Linear Algebra Package - Shared libs. for MPI
+ ii schedutils 1.5.0-1 Linux scheduler utilities
-+ ii scilab 4.1.2-7 Matrix-based scientific software package (a la Matlab
-+ ii scilab-bin 4.1.2-7 Matrix-based scientific software package (a la Matlab
-+ ii scilab-doc 4.1.2-7 Matrix-based scientific software package (a la Matlab
++ ii scilab 4.1.2-7 Matrix-based scientific software package (a la Matlab
++ ii scilab-bin 4.1.2-7 Matrix-based scientific software package (a la Matlab
++ ii scilab-doc 4.1.2-7 Matrix-based scientific software package (a la Matlab
+ ii sciplot-dev 1.36-11 Development library and header files for SciPlot
+ ii sciplot1 1.36-11 widget for scientific plotting
+ ii scite 1.71-1 Lightweight GTK-based Programming Editor
@@ -3295,6 +3297,7 @@
+ ii vino 2.16.0-5+c5+1 VNC server for GNOME
+ ii vlc 0.8.6-svn20061012.d multimedia player and streamer
+ ii vlc-nox 0.8.6-svn20061012.d multimedia player and streamer (without X support)
++ ii vmware-kernel-modul 6.5.2-7+2.6.26-14 vmware-kernel modules for Linux (kernel 2.6.26-1-amd64
+ ii vmware-kernel-modul 6.5.2-c5-5 vmware-kernel modules for Linux (kernel 2.6.26-2-amd64
+ ii vmware-player 6.5.2-7 VMware player
+ ii vnc4-common 4.1.1+X4.3.0-21+etc Virtual network computing server software
@@ -3395,7 +3398,7 @@
+ ii xmms-iris 0.12-3.1 advanced OpenGL visualization plugin for XMMS
+ ii xmms-jack 0.16-2 xmms output plugin to the jack audio server
+ ii xmms-jackasyn 0.3-1 JACK Output plugin for xmms
-+ ii xmms-jess 2.9.1-8.1 visualization plugin for XMMS using various 2D and 3D
++ ii xmms-jess 2.9.1-8.1 visualization plugin for XMMS using various 2D and 3D
+ ii xmms-kde 3.2-2 MP3 player integrated into the KDE panel
+ ii xmms-kjofol 0.95.0debian3-4 XMMS remote that uses K-Jofol's skins
+ ii xmms-kjofol-skins 0.95.0debian3-4 Skins for the xmms-kjofol package
@@ -3420,7 +3423,7 @@
+ ii xmms-speex 0.9.2b-1 Speex Speech Codec - XMMS input plugin
+ ii xmms-stats 0.2-2 Make stats of your preferred songs
+ ii xmms-status-plugin 1.0.0-3 Status panel applet for XMMS
-+ ii xmms-synaesthesia 0.0.3-10 visualization plugin for XMMS with a field of glowing
++ ii xmms-synaesthesia 0.0.3-10 visualization plugin for XMMS with a field of glowing
+ ii xmms-volnorm 0.8.3-1 XMMS plugin that gives all songs the same volume level
+ ii xmms-wmdiscotux 1.3-3 Tux dancing to the music played by xmms
+ ii xmms-xf86audio 0.4.4-1 XF86Audio multimedia-key support for XMMS
@@ -3498,7 +3501,7 @@
+ ii xvidcap 1.1.4-0.0 Screen video capture for X
+ ii xvnc4viewer 4.1.1+X4.3.0-21+etc Virtual network computing client software for X
+ ii xwine 1.0.1-1etch1 graphical user interface for the WINE emulator
-+ ii xxdiff 3.2-2 a graphical file and directories comparison and merge
++ ii xxdiff 3.2-2 a graphical file and directories comparison and merge
+ ii xxgdb 1.12-13.2 A X front-end to the GNU debugger gdb
+ ii yacpi 2.0.1.1-1 ncurses based acpi monitor for text mode
+ ii yapps2 2.1.1-17.1 Yet Another Python Parser System
@@ -3513,11 +3516,12 @@
+ 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-11.0.10-1/README_aster.html
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_aster.html 2011-02-15 10:09:15.000000000 +0100
-@@ -0,0 +1,631 @@
++++ aster-11.0.10-1/README_aster.html 2011-12-16 16:19:30.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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -3794,17 +3798,18 @@
+<div class="contents topic" id="summary">
+<p class="topic-title first">Summary</p>
+<ul class="simple">
-+<li><a class="reference internal" href="#prerequisites-change" id="id1">Prerequisites change</a></li>
-+<li><a class="reference internal" href="#license-and-packaging" id="id2">License and packaging</a></li>
-+<li><a class="reference internal" href="#for-really-impatient" id="id3">For really impatient</a></li>
-+<li><a class="reference internal" href="#distribution" id="id4">Distribution</a></li>
-+<li><a class="reference internal" href="#required-products" id="id5">Required products</a></li>
-+<li><a class="reference internal" href="#preferences" id="id6">Preferences</a></li>
-+<li><a class="reference internal" href="#full-installation" id="id7">Full installation</a></li>
-+<li><a class="reference internal" href="#installation-with-products-selection" id="id8">Installation with products selection</a></li>
-+<li><a class="reference internal" href="#if-an-error-occurs" id="id9">If an error occurs...</a></li>
-+<li><a class="reference internal" href="#log-output" id="id10">Log output</a></li>
-+<li><a class="reference internal" href="#test-your-installation" id="id11">Test your installation</a></li>
++<li><a class="reference internal" href="#why-is-this-package-tagged-11-0-10" id="id1">Why is this package tagged 11.0.10 ?</a></li>
++<li><a class="reference internal" href="#prerequisites-change" id="id2">Prerequisites change</a></li>
++<li><a class="reference internal" href="#license-and-packaging" id="id3">License and packaging</a></li>
++<li><a class="reference internal" href="#for-really-impatient" id="id4">For really impatient</a></li>
++<li><a class="reference internal" href="#distribution" id="id5">Distribution</a></li>
++<li><a class="reference internal" href="#required-products" id="id6">Required products</a></li>
++<li><a class="reference internal" href="#preferences" id="id7">Preferences</a></li>
++<li><a class="reference internal" href="#full-installation" id="id8">Full installation</a></li>
++<li><a class="reference internal" href="#installation-with-products-selection" id="id9">Installation with products selection</a></li>
++<li><a class="reference internal" href="#if-an-error-occurs" id="id10">If an error occurs...</a></li>
++<li><a class="reference internal" href="#log-output" id="id11">Log output</a></li>
++<li><a class="reference internal" href="#test-your-installation" id="id12">Test your installation</a></li>
+</ul>
+</div>
+<p>For further informations visit <a class="reference external" href="http://www.code-aster.org">http://www.code-aster.org</a>.
@@ -3814,16 +3819,30 @@
+<pre class="literal-block">
+python setup.py --help
+</pre>
++<div class="section" id="why-is-this-package-tagged-11-0-10">
++<h1><a class="toc-backref" href="#id1">Why is this package tagged 11.0.10 ?</a></h1>
++<blockquote>
++Usually only stable versions of Code_Aster are packaged in an aster-full archive.
++Because several extensive changes are expected in Code_Aster 11.1, the
++freeze of Code_Aster 11.0 has been anticipated in April 2011 to start
++these developments as soon as possible.
++However the next release of SaloméMéca (based on Salomé 6.3.0) requires
++the med 3.0 library which has been integrated in 11.0.5.
++That's why this package is based on the last Code_Aster development
++version available at the beginning of June : 11.0.10.</blockquote>
++</div>
+<div class="section" id="prerequisites-change">
-+<h1><a class="toc-backref" href="#id1">Prerequisites change</a></h1>
++<h1><a class="toc-backref" href="#id2">Prerequisites change</a></h1>
+<blockquote>
-+Starting with Code_Aster 10.2, numpy is required (in replacement of Numeric).
++<p>Starting with Code_Aster 11.0, the minimal version of Python is 2.6.</p>
++<p>Starting with Code_Aster 10.2, numpy is required (in replacement of Numeric).
+You must install the python-numpy package from your distribution or compile
+it from sources. You may need to set PYTHONPATH to make setup able to
-+import numpy.</blockquote>
++import numpy.</p>
++</blockquote>
+</div>
+<div class="section" id="license-and-packaging">
-+<h1><a class="toc-backref" href="#id2">License and packaging</a></h1>
++<h1><a class="toc-backref" href="#id3">License and packaging</a></h1>
+<blockquote>
+<p>Code_Aster is distributed under the terms of the GNU General Public License.
+The text is available at : <a class="reference external" href="http://www.code-aster.org/telechargement_doc/GPL.txt">http://www.code-aster.org/telechargement_doc/GPL.txt</a></p>
@@ -3840,7 +3859,7 @@
+</blockquote>
+</div>
+<div class="section" id="for-really-impatient">
-+<h1><a class="toc-backref" href="#id3">For really impatient</a></h1>
++<h1><a class="toc-backref" href="#id4">For really impatient</a></h1>
+<blockquote>
+<p>If you have a recent Linux distribution you may try direclty
+(just modify ASTER_ROOT in setup.cfg if you don't have write
@@ -3858,14 +3877,6 @@
+You can always set them using the <cite>setup.cfg</cite> configuration file.
+You can also use PATH and LD_LIBRARY_PATH environment variables
+to help <cite>setup.py</cite> to find the compiler you prefer.</p>
-+</blockquote>
-+</li>
-+<li><p class="first">Note about gcc / gfortran</p>
-+<blockquote>
-+<p>If your distribution comes with gfortran instead of g77 you
-+should install g77 (only on 32 bits platforms, not on 64 bits ones).
-+Performance is also about twice better with g77 than gfortran.
-+So we recommend to use g77 on 32 bits platforms.</p>
+</blockquote>
+</li>
+<li><p class="first">Note about Intel Compilers</p>
@@ -3896,7 +3907,7 @@
+</blockquote>
+</div>
+<div class="section" id="distribution">
-+<h1><a class="toc-backref" href="#id4">Distribution</a></h1>
++<h1><a class="toc-backref" href="#id5">Distribution</a></h1>
+<blockquote>
+<p>The package "aster-xxx.tar" contains :</p>
+<blockquote>
@@ -3908,21 +3919,18 @@
+<li><p class="first">SRC/ : archives of Code_Aster and its prerequisites :</p>
+<blockquote>
+<ul class="simple">
-+<li>Code_Aster 10.3.0,</li>
-+<li>astk 1.8.4 (Code_Aster study manager),</li>
-+<li>eficas 2.1.1 (Code_Aster commands file editor),</li>
++<li>Code_Aster 11.0.10,</li>
++<li>astk 1.10.0 (Code_Aster study manager),</li>
++<li>eficas 6.3.0 (Code_Aster commands file editor),</li>
+<li>mumps 4.9.2 (direct solver library),</li>
-+<li>med 2.3.6 (Data Exchange Model),</li>
-+<li>hdf5 1.6.9 (platform independent file format),</li>
-+<li>metis-edf 4.1 (reordering tool with specific changes for Code_Aster),</li>
++<li>med 3.0.3 (Data Exchange Model),</li>
++<li>hdf5 1.8.4 (platform independent file format),</li>
++<li>metis-edf 4.0.3 (reordering tool with specific changes for Code_Aster),</li>
+<li>metis 4.0 (official release),</li>
-+<li>scotch 4.0 (partitioning tool),</li>
-+<li>omniORB 4.1.4 (CORBA implementation for Code_Aster-Salomé link),</li>
-+<li>omniORBpy 3.4 (omniORB python module),</li>
-+<li>pylotage 2.0.5 (minimal plugin to exchange with Salomé),</li>
++<li>scotch 5.1.11_esmumps (partitioning tool),</li>
+<li>grace 5.1.21 (plotting of 2D graph),</li>
-+<li>homard 9.8 (refine/unrefine meshes), [binary 32/64 bits]</li>
-+<li>gmsh 2.4.2 (mesh generator, med support), [binary]</li>
++<li>homard 10.1 (refine/unrefine meshes), [binary 32/64 bits]</li>
++<li>gmsh 2.5.0 (mesh generator, med support), [binary]</li>
+<li>gibi 2000 (mesh generator). [binary]</li>
+</ul>
+</blockquote>
@@ -3939,9 +3947,9 @@
+</blockquote>
+</div>
+<div class="section" id="required-products">
-+<h1><a class="toc-backref" href="#id5">Required products</a></h1>
++<h1><a class="toc-backref" href="#id6">Required products</a></h1>
+<blockquote>
-+<p>All you need is a recent Python installation (>=2.4, <3.0) with Python headers
++<p>All you need is a recent Python installation (>=2.6, <3.0) with Python headers
+(provided in python-dev package or similar) with the numpy module (provided
+in python-numpy or similar) and tcl/tk.</p>
+<p>All python modules are now installed into ASTER_ROOT/public/lib/pythonX.Y/...</p>
@@ -3958,7 +3966,7 @@
+</blockquote>
+</div>
+<div class="section" id="preferences">
-+<h1><a class="toc-backref" href="#id6">Preferences</a></h1>
++<h1><a class="toc-backref" href="#id7">Preferences</a></h1>
+<blockquote>
+<p>The setup will automatically search for basic components in
+standard directories (in this order)</p>
@@ -3987,13 +3995,13 @@
+weekly updates.
+Just edit <cite>setup.cfg</cite> file and add a line as</p>
+<pre class="literal-block">
-+ASTER_VERSION='NEW10'
++ASTER_VERSION='NEW11'
+</pre>
+</blockquote>
+</blockquote>
+</div>
+<div class="section" id="full-installation">
-+<h1><a class="toc-backref" href="#id7">Full installation</a></h1>
++<h1><a class="toc-backref" href="#id8">Full installation</a></h1>
+<blockquote>
+<p>Using this mode you wish install all products included in the
+package.</p>
@@ -4031,7 +4039,7 @@
+</ol>
+</div>
+<div class="section" id="installation-with-products-selection">
-+<h1><a class="toc-backref" href="#id8">Installation with products selection</a></h1>
++<h1><a class="toc-backref" href="#id9">Installation with products selection</a></h1>
+<blockquote>
+You have two possibilities to select which products you will
+install : giving the list of products to install (see 1.)
@@ -4051,7 +4059,7 @@
+</ol>
+</div>
+<div class="section" id="if-an-error-occurs">
-+<h1><a class="toc-backref" href="#id9">If an error occurs...</a></h1>
++<h1><a class="toc-backref" href="#id10">If an error occurs...</a></h1>
+<blockquote>
+Two kinds of errors can occur : installation or built problem.</blockquote>
+<ol class="arabic">
@@ -4085,7 +4093,7 @@
+</ol>
+</div>
+<div class="section" id="log-output">
-+<h1><a class="toc-backref" href="#id10">Log output</a></h1>
++<h1><a class="toc-backref" href="#id11">Log output</a></h1>
+<blockquote>
+<p>If an error occurs it's better to attach all the traceback if
+you ask any questions to Code_Aster forum.
@@ -4098,7 +4106,7 @@
+</blockquote>
+</div>
+<div class="section" id="test-your-installation">
-+<h1><a class="toc-backref" href="#id11">Test your installation</a></h1>
++<h1><a class="toc-backref" href="#id12">Test your installation</a></h1>
+<blockquote>
+<p>Following steps suppose installation (python setup.py install...)
+ended with a correct diagnostic</p>
@@ -4152,8 +4160,8 @@
Index: aster-11.0.10-1/README_aster.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_aster.txt 2011-02-15 10:09:16.000000000 +0100
-@@ -0,0 +1,328 @@
++++ aster-11.0.10-1/README_aster.txt 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,332 @@
+README FOR CODE_ASTER INSTALLATION
+==================================
+
@@ -4176,8 +4184,23 @@
+ python setup.py --help
+
+
++Why is this package tagged 11.0.10 ?
++------------------------------------
++
++ Usually only stable versions of Code_Aster are packaged in an aster-full archive.
++ Because several extensive changes are expected in Code_Aster 11.1, the
++ freeze of Code_Aster 11.0 has been anticipated in April 2011 to start
++ these developments as soon as possible.
++ However the next release of SaloméMéca (based on Salomé 6.3.0) requires
++ the med 3.0 library which has been integrated in 11.0.5.
++ That's why this package is based on the last Code_Aster development
++ version available at the beginning of June : 11.0.10.
++
++
+Prerequisites change
+--------------------
++
++ Starting with Code_Aster 11.0, the minimal version of Python is 2.6.
+
+ Starting with Code_Aster 10.2, numpy is required (in replacement of Numeric).
+ You must install the python-numpy package from your distribution or compile
@@ -4187,7 +4210,7 @@
+
+License and packaging
+---------------------
-+
++
+ Code_Aster is distributed under the terms of the GNU General Public License.
+ The text is available at : http://www.code-aster.org/telechargement_doc/GPL.txt
+
@@ -4204,7 +4227,7 @@
+
+For really impatient
+--------------------
-+
++
+ If you have a recent Linux distribution you may try direclty
+ (just modify ASTER_ROOT in setup.cfg if you don't have write
+ access to /opt/aster or use --prefix option) ::
@@ -4215,7 +4238,7 @@
+
+
+ - Note about compilers
-+
++
+ `setup.py` tries now to find automatically your compilers.
+ By default it searches GNU compilers.
+ After searching it writes found values. Check them before continue.
@@ -4224,30 +4247,22 @@
+ to help `setup.py` to find the compiler you prefer.
+
+
-+ - Note about gcc / gfortran
-+
-+ If your distribution comes with gfortran instead of g77 you
-+ should install g77 (only on 32 bits platforms, not on 64 bits ones).
-+ Performance is also about twice better with g77 than gfortran.
-+ So we recommend to use g77 on 32 bits platforms.
-+
-+
+ - Note about Intel Compilers
-+
++
+ Its recommended to use Intel compilers for aster, mumps and metis
+ and to let GNU compilers for the other products.
+ To do that just edit `setup.cfg` and uncomment these lines ::
-+
++
+ PREFER_COMPILER_aster = 'Intel'
+ PREFER_COMPILER_mumps = PREFER_COMPILER_aster
+ PREFER_COMPILER_metis = PREFER_COMPILER_aster
+ PREFER_COMPILER_metis_edf = PREFER_COMPILER_aster
-+
++
+ You can "source" the compiler environment script, iccvars.sh,
+ ifortvars.sh and mklvarsXX.sh to set environment variables
+ for Intel Compilers to help `setup.py` to find your compilers.
+ For example ::
-+
++
+ source /opt/intel/cc/*/bin/iccvars.sh
+ source /opt/intel/fc/*/bin/ifortvars.sh
+ source /opt/intel/mkl/*/tools/environment/mklvars32.sh
@@ -4257,33 +4272,30 @@
+
+Distribution
+------------
-+
++
+ The package "aster-xxx.tar" contains :
-+
++
+ - setup.py (and others .py) : setup scripts
+ - setup.cfg : configuration file to adjust according to your configuration.
+ - SRC/ : archives of Code_Aster and its prerequisites :
+
-+ - Code_Aster 10.3.0,
-+ - astk 1.8.4 (Code_Aster study manager),
-+ - eficas 2.1.1 (Code_Aster commands file editor),
++ - Code_Aster 11.0.10,
++ - astk 1.10.0 (Code_Aster study manager),
++ - eficas 6.3.0 (Code_Aster commands file editor),
+ - mumps 4.9.2 (direct solver library),
-+ - med 2.3.6 (Data Exchange Model),
-+ - hdf5 1.6.9 (platform independent file format),
-+ - metis-edf 4.1 (reordering tool with specific changes for Code_Aster),
++ - med 3.0.3 (Data Exchange Model),
++ - hdf5 1.8.4 (platform independent file format),
++ - metis-edf 4.0.3 (reordering tool with specific changes for Code_Aster),
+ - metis 4.0 (official release),
-+ - scotch 4.0 (partitioning tool),
-+ - omniORB 4.1.4 (CORBA implementation for Code_Aster-Salomé link),
-+ - omniORBpy 3.4 (omniORB python module),
-+ - pylotage 2.0.5 (minimal plugin to exchange with Salomé),
++ - scotch 5.1.11_esmumps (partitioning tool),
+ - grace 5.1.21 (plotting of 2D graph),
-+ - homard 9.8 (refine/unrefine meshes), [binary 32/64 bits]
-+ - gmsh 2.4.2 (mesh generator, med support), [binary]
++ - homard 10.1 (refine/unrefine meshes), [binary 32/64 bits]
++ - gmsh 2.5.0 (mesh generator, med support), [binary]
+ - gibi 2000 (mesh generator). [binary]
+
+
+ Important note :
-+
++
+ homard, gmsh and gibi are provided here as precompiled for Linux.
+ When installing this product on another platform type they
+ must be disabled (see INSTALLATION WITH PRODUCTS SELECTION section).
@@ -4293,19 +4305,19 @@
+
+Required products
+-----------------
-+
-+ All you need is a recent Python installation (>=2.4, <3.0) with Python headers
++
++ All you need is a recent Python installation (>=2.6, <3.0) with Python headers
+ (provided in python-dev package or similar) with the numpy module (provided
+ in python-numpy or similar) and tcl/tk.
+
+ All python modules are now installed into ASTER_ROOT/public/lib/pythonX.Y/...
-+
++
+ Note :
+ To use eficas Python must have been installed with Tkinter or Qt4 support.
+ After installation, you will have eficasTk and eficasQt.
+ Note that next releases will only come with Qt interface. So it is
+ recommended to use eficasQt.
-+
++
+ Note :
+ Python shared libraries are sometimes required
+ ("--enable-shared" option in configure of Python setup).
@@ -4313,24 +4325,24 @@
+
+Preferences
+-----------
-+
++
+ The setup will automatically search for basic components in
+ standard directories (in this order) ::
-+
++
+ /usr/local/bin, /usr/bin, /bin, /usr/X11R6/bin,
+ /usr/bin/X11 (Tru64 specific),
+ /usr/openwin/bin (Solaris specific).
-+
++
+ (analog paths are used to search for libraries and includes)
-+
++
+ You can set BINDIR (or LIBDIR, INCLUDEDIR) to force the script
+ to search also in your own directories. Edit `setup.cfg` and
+ for example ::
-+
++
+ BINDIR=['/home/aster/public/bin', '/opt/bin']
+
+ Note :
-+
++
+ Following common tools are automatically searched during the setup :
+ shell interpreter (one choosen between bash, ksh or zsh),
+ terminal (on choosen between xterm -recommended-, gnome-terminal, konsole),
@@ -4338,17 +4350,17 @@
+ xedit or vi).
+
+ Note for developpers :
-+
++
+ You can install this Code_Aster version to make development and follow
+ weekly updates.
+ Just edit `setup.cfg` file and add a line as ::
-+
-+ ASTER_VERSION='NEW10'
-+
++
++ ASTER_VERSION='NEW11'
++
+
+Full installation
+-----------------
-+
++
+ Using this mode you wish install all products included in the
+ package.
+
@@ -4358,7 +4370,7 @@
+1. Complete `setup.cfg` file to adjust it regarding your
+ configuration. Only ASTER_ROOT is necessary.
+ Read carefully comments describing the optionnal parameters.
-+
++
+ Note :
+ you can also use --prefix=ASTER_ROOT option of setup.py to
+ change ASTER_ROOT destination directory (equivalent to --aster_root).
@@ -4371,7 +4383,7 @@
+ prerequisites takes about 15-20 min. The real time depends on your
+ configuration. Two Code_Aster executables are built : with and without
+ debugging informations.
-+
++
+ Note :
+ `python setup.py --help` prints informations about available options
+ and products selection.
@@ -4383,15 +4395,15 @@
+ You have two possibilities to select which products you will
+ install : giving the list of products to install (see 1.)
+ or specify the products you don't want to install (see 2.).
-+
++
+1. You can give the name of the products to install (space separated) ::
-+
++
+ python setup.py install --prefix=... product1 [products2 [...]]
+
+
+2. You can disable a product installation by adding lines to
+ `setup.cfg` ::
-+
++
+ _install_PRODUCT_NAME = False
+
+
@@ -4423,7 +4435,7 @@
+ using as_run.
+
+ Rerun the built ::
-+
++
+ cd /opt/aster/NEW11.0
+ make
+ or
@@ -4439,7 +4451,7 @@
+ you ask any questions to Code_Aster forum.
+ All output informations are saved into the 'setup.log.*' files.
+ Save all output informations into an archive ::
-+
++
+ tar cvjf install_problem.tar.bz2 setup.log.* setup.dbg.*
+
+ Warning: the size limit of attachments is 2 MB.
@@ -4458,22 +4470,22 @@
+
+ - Change to your ASTER_ROOT directory and enter in
+ ASTER_VERSION directory ::
-+
++
+ cd /opt/aster/NEW11.0
+
+ - Start the small example ::
-+
++
+ /opt/aster/bin/as_run forma01a.export
+
+2. Run a list of test cases
+
+ - Change to your ASTER_ROOT directory and enter in
+ ASTER_VERSION directory ::
-+
++
+ cd /opt/aster/NEW11.0
+
+ - Start the complete test suite ::
-+
++
+ /opt/aster/bin/as_run astout.export
+
+ Note :
@@ -4485,7 +4497,7 @@
Index: aster-11.0.10-1/__pkginfo__.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/__pkginfo__.py 2011-02-15 10:09:13.000000000 +0100
++++ aster-11.0.10-1/__pkginfo__.py 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -4508,12 +4520,12 @@
+"""
+
+modname = 'codeaster-setup'
-+numversion = (10, 2)
++numversion = (11, 0)
+version = '.'.join([str(num) for num in numversion])
+release = '1'
+
+license = 'GPL, LGPL, non-free'
-+copyright = 'Copyright (c) 2001-2010 EDF R&D - http://www.code-aster.org'
++copyright = 'Copyright (c) 2001-2011 EDF R&D - http://www.code-aster.org'
+
+short_desc = "Setup script for Code_Aster and some prerequisites"
+long_desc = short_desc
@@ -4525,8 +4537,8 @@
Index: aster-11.0.10-1/as_setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/as_setup.py 2011-02-15 10:09:11.000000000 +0100
-@@ -0,0 +1,2092 @@
++++ aster-11.0.10-1/as_setup.py 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,2132 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
+# COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
@@ -4565,7 +4577,7 @@
+
+import sys
+import os
-+import os.path
++import os.path as osp
+import popen2
+import glob
+import re
@@ -4629,7 +4641,7 @@
+ lnew = []
+ lpath = (':'.join(lpath)).split(':')
+ for p in lpath:
-+ p = os.path.abspath(p)
++ p = osp.abspath(p)
+ if p != '' and not dvu.get(p, False):
+ lnew.append(p)
+ dvu[p] = True
@@ -4675,9 +4687,9 @@
+ return SC.get_python_lib(prefix=prefix)
+
+def GetPrefix(site_packages):
-+ suff = os.path.join('lib', 'python'+sys.version[:3], 'site-packages')
++ suff = osp.join('lib', 'python'+sys.version[:3], 'site-packages')
+ if not site_packages.endswith(suff):
-+ suff = os.path.join('lib64', 'python'+sys.version[:3], 'site-packages')
++ suff = osp.join('lib64', 'python'+sys.version[:3], 'site-packages')
+ if not site_packages.endswith(suff):
+ raise SetupError(_('invalid `site_packages` path : %s') % site_packages)
+ return site_packages.replace(suff, '')
@@ -4685,20 +4697,20 @@
+def AddToPostInstallDir(filename, postinst, dest):
+ """Add filename to post-installation directory.
+ """
-+ fbas = os.path.basename(filename)
-+ fdir = os.path.dirname(filename)
++ fbas = osp.basename(filename)
++ fdir = osp.dirname(filename)
+ ibckp = 0
-+ fnum = os.path.join(postinst, '%06d_numfile' % 0)
-+ if os.path.exists(fnum):
++ fnum = osp.join(postinst, '%06d_numfile' % 0)
++ if osp.exists(fnum):
+ try:
+ ibckp = int(open(fnum, 'r').read().strip())
+ except:
+ pass
+ ibckp += 1
-+ #bckpf = os.path.join(postinst, '%06d_file_%s' % (ibckp, fbas))
-+ bdest = os.path.join(postinst, '%06d_dest_%s' % (ibckp, fbas))
++ #bckpf = osp.join(postinst, '%06d_file_%s' % (ibckp, fbas))
++ bdest = osp.join(postinst, '%06d_dest_%s' % (ibckp, fbas))
+ open(fnum, 'w').write(str(ibckp))
-+ open(bdest, 'w').write(os.path.join(dest, filename))
++ open(bdest, 'w').write(osp.join(dest, filename))
+
+#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
@@ -4727,7 +4739,7 @@
+ .clean_actions : give the list of actions run if 'Go' failed,
+ .temporary_folder : setup working directory,
+ .exit_code : None during process, exit code after,
-+
++
+ .depend : DEPENDENCIES object.
+
+ + Shell, VerbStart, VerbIgnore, VerbEnd : shortcuts to SYSTEM methods
@@ -4765,7 +4777,7 @@
+ 'depend' : None,
+ 'archive' : '%s-%s' % (self.product, self.version),
+ 'content' : '%s-%s' % (self.product, self.version),
-+ 'workdir' : os.path.join(self.temporary_folder,
++ 'workdir' : osp.join(self.temporary_folder,
+ 'install_'+self.product+'.'+str(os.getpid())),
+ 'delimiter' : re.escape('?'),
+ 'manual' : True,
@@ -4788,7 +4800,7 @@
+ self.actions = kargs.get('actions', default_actions)
+ self.clean_actions = kargs.get('clean_actions', [])
+ for d in ('installdir', 'sourcedir', 'workdir'):
-+ setattr(self, d, os.path.abspath(getattr(self, d)))
++ setattr(self, d, osp.abspath(getattr(self, d)))
+
+ # external methods
+ system=kargs.get('system')
@@ -4801,7 +4813,7 @@
+ self.VerbIgnore = system.VerbIgnore
+ self.VerbEnd = system.VerbEnd
+ self._print = kargs['log']._print
-+
++
+ # print product informations
+ self.Info()
+
@@ -4864,14 +4876,14 @@
+ """
+ # fill cache file
+ self.depend.FillCache(self.product)
-+
++
+ # check for permissions and create directories
+ self.VerbStart(_('Checking permissions...'))
+ iret=0
+ ldirs=[self.installdir, self.workdir]
+ for d in ldirs:
+ try:
-+ if not os.path.exists(d):
++ if not osp.exists(d):
+ os.makedirs(d)
+ elif os.access(d, os.W_OK)==0:
+ raise OSError(_('no permission to write in %s') % d)
@@ -4903,26 +4915,26 @@
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
+ return
-+ archive = kargs.get('archive', os.path.join(self.sourcedir,self.archive))
++ archive = kargs.get('archive', osp.join(self.sourcedir,self.archive))
+ command = kargs.get('command')
+ newname = kargs.get('extract_as', None)
+ path=self.workdir
+ iextr_as=newname<>None and self.content<>newname and self.content<>'.'
+ if iextr_as:
-+ path=os.path.join(self.workdir,'tmp_extract')
-+ if not os.path.exists(path):
++ path=osp.join(self.workdir,'tmp_extract')
++ if not osp.exists(path):
+ os.makedirs(path)
+
-+ if not os.path.isfile(archive):
++ if not osp.isfile(archive):
+ l_fic = []
+ for opt in ('', '-*'):
+ for ext in ('.tar', '.tar.gz', '.tgz', '.tar.bz2'):
+ l_fic.extend(glob.glob(archive + opt + ext))
+ if len(l_fic) > 0:
+ archive = l_fic[0]
-+ if not os.path.isfile(archive):
++ if not osp.isfile(archive):
+ self.exit_code=1
-+ raise SetupExtractError(_("file not found : ") % archive)
++ raise SetupExtractError(_("file not found : %s") % archive)
+
+ prev=os.getcwd()
+ self._print(self._fmt_enter % path)
@@ -4930,12 +4942,12 @@
+
+ if command != None:
+ iret,output = self.Shell(command,
-+ alt_comment=_('Extracting %s...') % os.path.basename(archive))
++ alt_comment=_('Extracting %s...') % osp.basename(archive))
+ if iret<>0:
+ self.exit_code=4
+ raise SetupExtractError(_('error during extracting archive %s') % archive)
+ else:
-+ self.VerbStart(_('Extracting %s...') % os.path.basename(archive))
++ self.VerbStart(_('Extracting %s...') % osp.basename(archive))
+ # open archive using tarfile module
+ try:
+ tar = tarfile.open(archive, 'r')
@@ -4986,9 +4998,9 @@
+ if iextr_as:
+ iret=0
+ self.VerbStart(_('Renaming %s to %s...') % (self.content, newname))
-+ newname=os.path.join(self.workdir,newname)
++ newname=osp.join(self.workdir,newname)
+ try:
-+ if os.path.exists(newname):
++ if osp.exists(newname):
+ self._print()
+ iret,output=self.Shell('rm -rf '+newname,
+ alt_comment=_('Deleting previous content of %s...') % newname)
@@ -5015,12 +5027,12 @@
+ """
+ self._print(self._fmt_title % _('Configuration'))
+ command = kargs.get('command')
-+ path = kargs.get('path', os.path.join(self.workdir,self.content))
++ path = kargs.get('path', osp.join(self.workdir,self.content))
+ path = self.special_vars(path)
+ if command==None:
+ command='./configure --prefix='+self.installdir
-+
-+ if not os.path.isdir(path):
++
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupConfigureError(_('directory not exists %s') % path)
+
@@ -5030,7 +5042,7 @@
+
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
-+
++
+ else:
+ self._print(_('Command line :'), command)
+ iret,output=self.Shell(command, follow_output=self.verbose,
@@ -5042,7 +5054,7 @@
+
+ self._print(self._fmt_leave % path)
+ os.chdir(prev)
-+
++
+#-------------------------------------------------------------------------------
+ def ChgFiles(self, **kargs):
+ """Modify files from 'files' according a dictionnary 'dtrans'
@@ -5062,11 +5074,11 @@
+ postinst = kargs.get('postinst')
+ postdest = kargs.get('postdest', self.installdir)
+ postdest = self.special_vars(postdest)
-+ path = kargs.get('path', os.path.join(self.workdir,self.content))
++ path = kargs.get('path', osp.join(self.workdir,self.content))
+ path = self.special_vars(path)
+ only_postinst = kargs.get('only_post', False)
+
-+ if not os.path.isdir(path):
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupChgFilesError(_('directory not exists %s') % path)
+
@@ -5076,13 +5088,13 @@
+
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
-+
++
+ else:
+ for f0 in chglist:
+ for f in glob.glob(f0):
+ iret=0
+ self.VerbStart(_('modifying %s') % f)
-+ if os.path.isfile(f):
++ if osp.isfile(f):
+ if not only_postinst:
+ iret=self._chgone(f, dtrans, delimiter, keep, ext)
+ if postinst != None:
@@ -5128,7 +5140,7 @@
+ self._call_external(**kargs)
+ return
+ command = kargs.get('command')
-+ lpath = kargs.get('path', os.path.join(self.workdir,self.content))
++ lpath = kargs.get('path', osp.join(self.workdir,self.content))
+ nbcpu = kargs.get('nbcpu', 1)
+ capturestderr = kargs.get('capturestderr', True)
+ if not type(lpath) in EnumTypes:
@@ -5137,10 +5149,10 @@
+ command = 'make'
+ if nbcpu != 1:
+ command += ' -j %d' % nbcpu
-+
++
+ for path in lpath:
+ path = self.special_vars(path)
-+ if not os.path.isdir(path):
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupConfigureError(_('directory not exists %s') % path)
+
@@ -5168,12 +5180,12 @@
+ """
+ self._print(self._fmt_title % _('Installation'))
+ command = kargs.get('command')
-+ path = kargs.get('path', os.path.join(self.workdir,self.content))
++ path = kargs.get('path', osp.join(self.workdir,self.content))
+ path = self.special_vars(path)
+ if command==None:
+ command='make install'
-+
-+ if not os.path.isdir(path):
++
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupInstallError(_('directory not exists %s') % path)
+
@@ -5183,7 +5195,7 @@
+
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
-+
++
+ else:
+ self._print(_('Command line :'), command)
+ iret,output=self.Shell(command, follow_output=self.verbose,
@@ -5212,7 +5224,7 @@
+ d_cmd['cmd'] = kargs.get('cmd', 'install')
+ d_cmd['cmd_opts'] = kargs.get('cmd_opts', '')
+ d_cmd['prefix'] = kargs.get('prefix', GetPrefix(self.installdir))
-+
++
+ kargs['command'] = kargs.get('command', format % d_cmd)
+ self.Install(**kargs)
+
@@ -5223,14 +5235,14 @@
+ path : one or more directories
+ """
+ self._print(self._fmt_title % _('Compiling Python source files'))
-+ lpath = kargs.get('path', os.path.join(self.workdir,self.content))
++ lpath = kargs.get('path', osp.join(self.workdir,self.content))
+ if not type(lpath) in EnumTypes:
+ lpath=[lpath,]
+
+ iret=0
+ for path in lpath:
+ path = self.special_vars(path)
-+ if not os.path.isdir(path):
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupInstallError(_('directory not exists %s') % path)
+
@@ -5267,8 +5279,9 @@
+ self.exit_code=4
+ raise SetupChmodError(_("an integer is required for 'mode'"))
+ path=kargs.get('path', self.installdir)
-+
-+ if not os.path.isdir(path):
++ path = self.special_vars(path)
++
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupChgFilesError(_('directory not exists %s') % path)
+
@@ -5278,13 +5291,13 @@
+
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
-+
++
+ else:
+ for f0 in chglist:
+ for f in glob.glob(f0):
+ iret=0
+ self.VerbStart(_('applying chmod %04o to %s') % (mode,f))
-+ if os.path.isfile(f):
++ if osp.isfile(f):
+ try:
+ os.chmod(f, mode)
+ except OSError:
@@ -5303,12 +5316,12 @@
+ """
+ self._print(self._fmt_title % _('Check for installation'))
+ command = kargs.get('command')
-+ path = kargs.get('path', os.path.join(self.workdir,self.content))
++ path = kargs.get('path', osp.join(self.workdir,self.content))
+ path = self.special_vars(path)
+ if command==None:
+ command='make check'
-+
-+ if not os.path.isdir(path):
++
++ if not osp.isdir(path):
+ self.exit_code=4
+ raise SetupConfigureError(_('directory not exists %s') % path)
+
@@ -5318,7 +5331,7 @@
+
+ if kargs.get('external')<>None:
+ self._call_external(**kargs)
-+
++
+ else:
+ self._print(_('Command line :'), command)
+ iret,output=self.Shell(command, follow_output=self.verbose,
@@ -5347,7 +5360,7 @@
+ self._print(self._fmt_enter % path)
+ os.chdir(path)
+
-+ for obj in [os.path.abspath(o) for o in to_del]:
++ for obj in [osp.abspath(o) for o in to_del]:
+ iret,output=self.Shell(cmd='rm -rf '+obj,
+ alt_comment=_('deleting %s...') % obj)
+ try:
@@ -5406,7 +5419,7 @@
+ self.VerbStart = system.VerbStart
+ self.VerbIgnore = system.VerbIgnore
+ self.VerbEnd = system.VerbEnd
-+
++
+ self.prod_req = {}
+ self.req_prod = {}
+ self.prod_set = {}
@@ -5450,11 +5463,11 @@
+ exec(v+'=0') in d
+ except Exception, msg:
+ raise SetupError(_(' invalid variable name %s' % repr(v)))
-+
++
+ if not self.prod_req.has_key(product): self.prod_req[product]=[]
+ if not self.prod_set.has_key(product): self.prod_set[product]=[]
+ if not self.req_obj.has_key(product): self.req_obj[product]=[]
-+
++
+ # takes from req only variables not set by product
+ for r in [r for r in req if not r in set]:
+ check_varname(r)
@@ -5550,7 +5563,7 @@
+ val=''.join(v.split(':')[1:])
+ if typ=='file':
+ vf=_chgline(val, self.cfg)
-+ if not os.path.exists(vf):
++ if not osp.exists(vf):
+ iret+=1
+ lerr.append(vf)
+ self._print(_(' %s requires this file : %s') % (repr(p), vf))
@@ -5571,7 +5584,7 @@
+ product=self.prod_req.keys()
+ if not type(product) in EnumTypes:
+ product=[product,]
-+
++
+ # fill cache file with values set by product(s)
+ self.VerbStart(_('Filling cache...'))
+ iret=0
@@ -5628,7 +5641,7 @@
+ self.VerbStart = system.VerbStart
+ self.VerbIgnore = system.VerbIgnore
+ self.VerbEnd = system.VerbEnd
-+
++
+ self._glob_title = "Code_Aster + %d of its prerequisites" % len(self.products)
+ self._t_ini = kargs.get('t_ini') or time.time()
+ for p in self.products:
@@ -5676,7 +5689,7 @@
+ """Return a representation of the SUMMARY object
+ """
+ self.diag[self._glob_title]['time'] = time.time() - self._t_ini
-+
++
+ self._print(self._fmt_title % _('SUMMARY OF INSTALLATION'))
+ for p in self.products + [self._glob_title,]:
+ self.VerbStart(self._fmt_sum % self.diag[p])
@@ -5722,9 +5735,9 @@
+ self.verbose = run['verbose']
+ self.debug = run['debug']
+ self._print = kargs['log']._print
-+ self.temporary_folder = os.path.join(kargs.get('temporary_folder', '/tmp'),
++ self.temporary_folder = osp.join(kargs.get('temporary_folder', '/tmp'),
+ 'system.%s' % os.getpid())
-+ if not os.path.exists(self.temporary_folder):
++ if not osp.exists(self.temporary_folder):
+ os.makedirs(self.temporary_folder)
+ if kargs.has_key('maxcmdlen'):
+ self.MaxCmdLen = kargs['maxcmdlen']
@@ -5890,16 +5903,16 @@
+ return d
+ if verbose==None:
+ verbose=self.verbose
-+
++
+ if not profile:
+ return
+ if type(profile) in (str, unicode):
-+ ftmp = os.path.join(self.temporary_folder, 'temp.opt_env')
++ ftmp = osp.join(self.temporary_folder, 'temp.opt_env')
+ open(ftmp, 'w').write(profile)
+ os.chmod(ftmp, 0755)
+ profile = ftmp
-+
-+ if not os.path.isfile(profile):
++
++ if not osp.isfile(profile):
+ self._mess(_('file not found : %s') % profile, '<A>_FILE_NOT_FOUND')
+ return
+ # read initial environment
@@ -5938,16 +5951,16 @@
+ for dirs in (prefdirs, others):
+ if not type(dirs) in EnumTypes:
+ dirs=[dirs]
-+ dirs=[os.path.realpath(i) for i in dirs if i<>'']
++ dirs=[osp.realpath(i) for i in dirs if i<>'']
+ for d in dirs:
+ if dnew.get(d) is None:
+ new.append(d)
+ dnew[d] = 1
+ if maxdepth > 0:
+ for d in dirs:
-+ level=len(d.split(os.path.sep))
++ level=len(d.split(osp.sep))
+ for root, l_dirs, l_nondirs in os.walk(d):
-+ lev=len(root.split(os.path.sep))
++ lev=len(root.split(osp.sep))
+ if lev <= (level + maxdepth):
+ if dnew.get(root) is None:
+ new.append(root)
@@ -6006,7 +6019,7 @@
+ self.var2tag[v] = k
+ for k in ('bin', 'lib', 'inc', 'pymod'):
+ self._print("std_dirs['%s'] =" % k, self.std_dirs[k], DBG=True)
-+
++
+ self.debug = kargs.get('debug', False)
+ self.Shell = kargs['system'].local_shell
+ self.temporary_folder = kargs['system'].temporary_folder
@@ -6063,16 +6076,16 @@
+ content = open(filename, 'r').read()
+ mlib = re.search('GROUP.*\((.*?)\)', content, re.IGNORECASE)
+ if mlib:
-+ dirn = os.path.dirname(filename)
++ dirn = osp.dirname(filename)
+ llibs = mlib.group(1).strip().split()
+ self._print('GROUP lib found, test %s' % llibs, DBG=True)
+ ok = True
+ for lib in llibs:
-+ if not os.path.exists(os.path.join(dirn, lib)):
++ if not osp.exists(osp.join(dirn, lib)):
+ if lib[:2] == '-l':
+ lib = 'lib' + lib[2:]
-+ lib = os.path.join(dirn, lib)
-+ if not os.path.exists(lib):
++ lib = osp.join(dirn, lib)
++ if not osp.exists(lib):
+ libtest = [lib + '.a', lib + '.so']
+ else:
+ libtest = [lib,]
@@ -6094,7 +6107,7 @@
+ prev = os.getcwd()
+ os.chdir(self.temporary_folder)
+ doto = out2.splitlines()[0]
-+ jret, out2 = self.Shell('%s x %s %s' % (self._command_ar, filename, doto),
++ jret, out2 = self.Shell('%s x %s %s' % (self._command_ar, filename, doto),
+ verbose=self.debug)
+ jret, out = self.Shell('%s %s' % (self._command_file, doto),
+ verbose=self.debug)
@@ -6189,9 +6202,9 @@
+ if self.debug:
+ self._print('search_dirs : \n%s' % os.linesep.join(search_dirs), DBG=True)
+ for dir in search_dirs:
-+ f = os.path.join(dir, name)
-+ if os.path.exists(f):
-+ self._last_found = os.path.abspath(f)
++ f = osp.join(dir, name)
++ if osp.exists(f):
++ self._last_found = osp.abspath(f)
+ chk = self.check_type(self._last_found, typ=typ)
+ if chk:
+ if not silent:
@@ -6226,10 +6239,10 @@
+ iret, out = self.Shell('locate %s | egrep "/%s$"' % (name, name),
+ verbose=self.debug)
+ if iret == 0:
-+ dirn = [os.path.dirname(d) for d in out.splitlines()]
++ dirn = [osp.dirname(d) for d in out.splitlines()]
+ for f in out.splitlines():
-+ if typ != 'bin' or (os.access(f, os.X_OK) and os.path.isfile(f)):
-+ d = os.path.dirname(f)
++ if typ != 'bin' or (os.access(f, os.X_OK) and osp.isfile(f)):
++ d = osp.dirname(f)
+ if not d in addto:
+ dnew.append(d)
+ addto.extend(dnew)
@@ -6265,12 +6278,12 @@
+ # give maximum chances to 'paths'
+ paths_in = paths[:]
+ for p in paths:
-+ paths_in.append(os.path.join(p, conv[typ]))
++ paths_in.append(osp.join(p, conv[typ]))
+ paths = paths_in
+ self._print('find_and_set %s' % filenames, DBG=True)
+ if cfg.has_key(var):
-+ paths.insert(0, os.path.join(cfg[var], conv[typ]))
-+ paths.insert(0, os.path.dirname(cfg[var]))
++ paths.insert(0, osp.join(cfg[var], conv[typ]))
++ paths.insert(0, osp.dirname(cfg[var]))
+ if not cfg.has_key(var) or append:
+ found=self.find_file(filenames, paths, maxdepth, silent, typ=typ)
+ adj = self._real_home(found, prefix_to)
@@ -6283,9 +6296,9 @@
+ msg = get_install_message(package=reqpkg, missed=' or '.join(filenames))
+ raise SetupConfigureError(msg)
+ else:
-+ root, ext = os.path.splitext(found)
-+ dirname = os.path.abspath(os.path.dirname(root))
-+ basename = os.path.basename(root)
++ root, ext = osp.splitext(found)
++ dirname = osp.abspath(osp.dirname(root))
++ basename = osp.basename(root)
+ if typ == 'lib':
+ if ext == self._ext_shared:
+ found = '-L%s -l%s' % (dirname, re.sub('^lib', '', basename))
@@ -6339,7 +6352,7 @@
+ l_names.append(name)
+ l_names.extend(['lib'+name+ext for ext in l_exts])
+ #XXX perhaps we should add the same paths with lib64 first on 64 bits platforms ?
-+ pathlib = [os.path.join(p, 'lib') for p in paths]
++ pathlib = [osp.join(p, 'lib') for p in paths]
+ paths = pathlib + paths
+ self.find_and_set(cfg, var, l_names, paths, err, 'lib', append, maxdepth,
+ silent, prefix_to, reqpkg)
@@ -6361,27 +6374,27 @@
+ toadd=[]
+ if typ=='bin':
+ for v in var.split():
-+ toadd.append(os.path.dirname(v))
++ toadd.append(osp.dirname(v))
+ elif typ=='lib':
+ for v in var.split():
+ if v[:2]=='-L':
+ toadd.append(v[2:])
+ elif v[:2]=='-l':
+ pass
-+ elif os.path.isabs(v):
-+ toadd.append(os.path.dirname(v))
++ elif osp.isabs(v):
++ toadd.append(osp.dirname(v))
+ elif typ=='inc':
+ for v in var.split():
+ if v[:2]=='-I':
+ toadd.append(v[2:])
-+ elif os.path.isabs(v):
++ elif osp.isabs(v):
+ if v.endswith('.h'):
-+ toadd.append(os.path.dirname(v))
++ toadd.append(osp.dirname(v))
+ else:
+ toadd.append(v)
+ elif typ=='pymod':
+ for v in var.split():
-+ if os.path.isabs(v):
++ if osp.isabs(v):
+ toadd.append(v)
+ else:
+ raise SetupError(_('unexpected type %s') % repr(typ))
@@ -6441,13 +6454,13 @@
+ ldec.extend(re.split('[=: ]+', lig))
+ # le prefix est normalement sur la premiere ligne,
+ # on essaie de ne garder que celui-ci
-+ ldirs = [os.path.normpath(p) for p in ldec if p.startswith(os.sep)][:1]
++ ldirs = [osp.normpath(p) for p in ldec if p.startswith(os.sep)][:1]
+ if len(ldirs) > 0:
+ pref = ldirs[0]
-+ self.AddToPath('bin', os.path.join(pref, 'bin'))
-+ self.AddToPath('lib', os.path.join(pref, 'lib'))
++ self.AddToPath('bin', osp.join(pref, 'bin'))
++ self.AddToPath('lib', osp.join(pref, 'lib'))
+ self.AddToPath('bin', compiler)
-+ prefbin = os.path.dirname(compiler)
++ prefbin = osp.dirname(compiler)
+ if prefbin != pref:
+ self.AddToPath('lib', prefbin)
+ pref = ', '.join([pref, prefbin])
@@ -6592,9 +6605,9 @@
+def get_absolute_path(path, follow_symlink=True):
+ """Retourne le chemin absolu en suivant les liens éventuels.
+ """
-+ if follow_symlink and os.path.islink(path):
-+ path = os.path.realpath(path)
-+ res = os.path.normpath(os.path.abspath(path))
++ if follow_symlink and osp.islink(path):
++ path = osp.realpath(path)
++ res = osp.normpath(osp.abspath(path))
+ return res
+
+
@@ -6619,11 +6632,50 @@
+ #print ">>>", src, dst, os.sep.join(common)
+ os.symlink(src, dst)
+
++
++def unexpandvars_string(text, vars=None):
++ """Reverse of os.path.expandvars."""
++ if vars is None:
++ vars = ('ASTER_ETC', 'ASTER_ROOT', 'HOME')
++ if type(text) not in (str, unicode):
++ return text
++ for var in vars:
++ if not os.environ.get(var):
++ continue
++ text = text.replace(os.environ[var], "$%s" % var)
++ return text
++
++def unexpandvars_list(enum, vars=None):
++ """Unexpand all values of ``enum``."""
++ new = []
++ for val in enum:
++ new.append(unexpandvars(val, vars))
++ return new
++
++def unexpandvars_tuple(enum, vars=None):
++ """Unexpand all values of ``enum``."""
++ return tuple(unexpandvars_list(enum, vars))
++
++def unexpandvars_dict(dico, vars=None):
++ """Unexpand all values of ``dico``."""
++ new = {}
++ for key, val in dico.items():
++ new[key] = unexpandvars(val, vars)
++ return new
++
++def unexpandvars(obj, vars=None):
++ """Unexpand the value of ``obj`` according to its type."""
++ dfunc = {
++ list : unexpandvars_list,
++ tuple : unexpandvars_tuple,
++ dict : unexpandvars_dict,
++ }
++ return dfunc.get(type(obj), unexpandvars_string)(obj, vars)
Index: aster-11.0.10-1/check_compilers.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/check_compilers.py 2011-02-15 10:09:11.000000000 +0100
-@@ -0,0 +1,935 @@
++++ aster-11.0.10-1/check_compilers.py 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,991 @@
+"""
+Configure compilers
+"""
@@ -6639,7 +6691,7 @@
+# ----- differ messages translation
+def _(mesg): return mesg
+
-+#-------------------------------------------------------------------------------
++
+trivial_src = {
+ 'CC' : """void trivial() {}
+""",
@@ -6668,8 +6720,7 @@
+
+d_name = { 'math' : 'MATHLIB', 'cxx' : 'CXXLIB', 'sys' : 'OTHERLIB' }
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
+class CheckCompilerError(SetupError):
+ pass
+
@@ -6687,7 +6738,7 @@
+ self.libs.append((typ, lib))
+# self.necessary = kargs.get('necessary', self.compilers[:] + [k for k, v in self.libs])
+ self.necessary = kargs['necessary']
-+
++
+ # external methods
+ system = kargs.get('system')
+ if system is None:
@@ -6695,7 +6746,7 @@
+ self.debug = system.debug
+ self.Shell = system.local_shell
+ self.AddToEnv = system.AddToEnv
-+
++
+ self.ftools = kargs.get('ftools')
+ if self.ftools is None:
+ raise CheckCompilerError(_("Argument not found 'ftools'"))
@@ -6703,7 +6754,7 @@
+ self._print = self.ftools._print
+ self.fcheck = self.ftools.check
+ self.maxdepth = self.ftools.maxdepth
-+
++
+ # platform
+ self.platform = kargs['platform']
+ self.arch = kargs['arch']
@@ -6711,7 +6762,7 @@
+ 'check_compilers.%s' % os.getpid())
+ if not os.path.exists(self.tmpdir):
+ os.makedirs(self.tmpdir)
-+
++
+ self.cfg = {}
+ # values (libs) used with all compilers
+ self.cfg_add_global = {}
@@ -6722,7 +6773,7 @@
+ 'LDFLAGS', 'FFLAGS_I8', 'F90FLAGS_I8']
+ # initial configuration (from setup.cfg)
+ self.init_value = kargs['init'].copy()
-+
++
+ # compiler options to add
+ self.add_option = kargs.get('add_option', [])
+
@@ -6733,7 +6784,6 @@
+
+ def clean(self):
+ os.system('rm -rf %s' % self.tmpdir)
-+
+
+ def find_compilers(self):
+ """Find compilers."""
@@ -6755,7 +6805,6 @@
+ else:
+ self._print(_('WARNING :'), reason)
+
-+
+ def set_compiler_version(self, var, fields):
+ """Stores compiler version."""
+ vers = None
@@ -6770,7 +6819,6 @@
+ self._print('compiler_version', var, repr(fields), vers, DBG=True)
+ self.compiler_version[var] = vers
+
-+
+ def check_init_value(self, var, set_in=None):
+ """Check for initial values given through setup.cfg.
+ """
@@ -6784,7 +6832,6 @@
+ self._print('Checking for initial value for %s... %s' % (var, ini or 'empty'), DBG=True)
+ return ini
+
-+
+ def create_key_from(self, what):
+ """Produce a clean key from a list of libs to search.
+ """
@@ -6793,7 +6840,6 @@
+ key = key[0].split('.')[0]
+ key = re.sub('[\-\+\*/@+\.]+', '', key)
+ return key
-+
+
+ def find_libs(self, lib=None):
+ """Find libraries."""
@@ -6811,7 +6857,7 @@
+ continue
+ else:
+ continue
-+
++
+ for args in search_libs:
+ necessary = True
+ name, what = args[:2]
@@ -6838,8 +6884,7 @@
+ self.count_error += 1
+ self._print(_('ERROR #%d:') % self.count_error, reason)
+ else:
-+ self._print(_('WARNING (probably not necessary):'), reason)
-+
++ self._print(_('WARNING (optional):'), reason)
+
+ def check_env(self):
+ """Check for environment profiles."""
@@ -6848,33 +6893,30 @@
+ for prof in self.env_files:
+ opt_env.append('. %s' % prof)
+ opt_env.append('')
-+
++
+ self.cfg['OPT_ENV'] = os.linesep.join(opt_env)
+ self.AddToEnv(self.cfg['OPT_ENV'], verbose=False)
-+
+
+ def after_compilers(self):
+ """After searching compilers, this allows to add libs to search
+ according to compiler version..."""
+ pass
+
-+
+ def after_libs(self):
+ """After searching libs, this allows to add a flag to ld or..."""
+ pass
+
-+
+ def add_on(self):
+ """After searching compilers, libs... search again other bin or lib."""
+ pass
-+
+
+ def init_flags(self):
+ """Init compiler options."""
+ for key in self.init_cfg:
+ self.cfg[key] = self.cfg.get(key, '')
-+ self.cfg['LD'] = self.cfg['F77']
-+
++ ini = self.check_init_value('LD')
++ if ini is None:
++ self.cfg['LD'] = self.cfg['F77']
+
+ def insert_option(self, option):
+ """Insert option string in CFLAGS, FFLAGS, F90FLAGS if where is True
@@ -6886,17 +6928,16 @@
+ for k in lkey:
+ self.cfg[k] += ' ' + option
+
-+
+ def set_flags(self):
+ """Set compiler options."""
+ pass
+
-+
+ def check_init_flags(self):
+ """Overwrites compiler options by setup.cfg."""
-+ for key in ('CFLAGS', 'FFLAGS', 'F90FLAGS', 'CFLAGS_DBG', 'FFLAGS_DBG', 'F90FLAGS_DBG'):
++ for key in ('CFLAGS', 'FFLAGS', 'F90FLAGS',
++ 'CFLAGS_DBG', 'FFLAGS_DBG', 'F90FLAGS_DBG',
++ 'LDFLAGS'):
+ ini = self.check_init_value(key)
-+
+
+ def check_ok(self):
+ """Returns False if an error occurred."""
@@ -6909,7 +6950,6 @@
+ if self.count_error > 0:
+ ok = False
+ return ok
-+
+
+ def final(self):
+ """The end."""
@@ -6926,7 +6966,6 @@
+ if re.search('__LIBS_math_[0-9]+_g2c', k) is not None \
+ or re.search('__LIBS_math_[0-9]+_gfortran', k) is not None:
+ self.cfg_add_global[k] = v
-+
+
+ def run(self):
+ """Runs the configure."""
@@ -6957,34 +6996,31 @@
+ self.final()
+ self.clean()
+
-+
+ def diag(self):
+ diag = self.check_ok()
+ if not diag:
+ diag = '%d error(s) (see previous ERROR)' % self.count_error
+ self.fcheck(diag, self.__doc__)
+
-+
+ def test_compil(self, lang, args='', src=None, verbose=None):
+ """Test a compiler."""
+ if verbose is None:
+ verbose = self.debug
+ ext = dict_ext[lang]
-+
++
+ prev = os.getcwd()
+ tmp = os.path.join(self.tmpdir, 'test_compil')
+ os.mkdir(tmp)
+ os.chdir(tmp)
-+
++
+ fsrc = 'test_compil.%s.%s' % (os.getpid(), ext)
+ open(fsrc, 'w').write(src or trivial_src[lang])
+ cmd = '%s -c %s %s' % (self.cfg[lang], args, fsrc)
+ iret, out = self.Shell(cmd, verbose=verbose)
-+
++
+ os.chdir(prev)
+ shutil.rmtree(tmp)
+ return iret == 0
-+
+
+ def get_cmd_compil(self, fsrc, integer8):
+ """Returns command line for compiling 'fsrc'."""
@@ -7013,7 +7049,6 @@
+ self._print('get_cmd_compil returns : ', cmd, DBG=True)
+ return cmd
+
-+
+ def run_test(self, dict_src):
+ """Compiling a program using blas/lapack."""
+ prev = os.getcwd()
@@ -7040,8 +7075,7 @@
+ shutil.rmtree(tmp)
+ return iret == 0, out
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
+class GNU_COMPILER(CONFIGURE_COMPILER):
+ """GNU compilers"""
+ CC = 'gcc'
@@ -7052,40 +7086,37 @@
+ def __init__(self, **kargs):
+ """Initialization."""
+ CONFIGURE_COMPILER.__init__(self, **kargs)
-+
++
+ if self.platform == 'LINUX64':
+ self.F77 = 'gfortran'
-+
++
+ self.fortran_supports_openmp = False
+ self.is_F77_is_gfortran = False
-+
+
+ def after_compilers(self):
+ """Define libs to search."""
+ self.libs.extend([('math', 'lapack'), ('math', 'blas'),
+ ('cxx', ['libstdc++.so', 'libstdc++.a']),])
-+
+
+ def add_on(self):
+ """After searching compilers, libs... search again other bin or lib."""
+ self.is_F77_is_gfortran = self.test_compil('F77',
+ args='-ffree-form -fdefault-integer-8', src=trivial_src['F90'])
+ self.fcheck(self.is_F77_is_gfortran, 'F77 (%s) is gfortran' % self.cfg.get('F77', '?'))
-+
++
+ self.fortran_supports_openmp = self.test_compil('F77', args='-fopenmp', src=trivial_src['F77'])
+ if self.cfg.get('F90'):
+ self.fortran_supports_openmp = self.fortran_supports_openmp and \
+ self.test_compil('F90', args='-ffree-form -fopenmp', src=trivial_src['F90'])
+ self.fcheck(self.fortran_supports_openmp, "F77 (%s) and F90 (%s) support '-fopenmp' option" \
+ % (self.cfg.get('F77', '?'), self.cfg.get('F90', '?')))
-+
++
+ # les blas/lapack en ont peut-etre besoin, on rend libg2c facultative si F77=gfortran
+ self.libs.append(('math', 'g2c', not self.is_F77_is_gfortran))
+ self.find_libs(lib=self.libs[-1])
+ if self.cfg.get('F90') or self.is_F77_is_gfortran:
+ self.libs.append(('math', 'gfortran'))
+ self.find_libs(lib=self.libs[-1])
-+
+
+ def set_flags(self):
+ """Set compiler options."""
@@ -7094,7 +7125,7 @@
+ self.fcheck(flagsp, "CC (%s) supports '-fno-stack-protector' option" % self.cfg.get('CC', '?'))
+ if flagsp:
+ self.cfg['CFLAGS'] += ' -fno-stack-protector'
-+
++
+ self.cfg['FFLAGS'] = '-O2'
+ if self.fortran_supports_openmp:
+ self.cfg['CFLAGS_OPENMP'] = '-fopenmp'
@@ -7106,7 +7137,7 @@
+ if self.is_F77_is_gfortran:
+ if self.platform == 'LINUX64':
+ self.cfg['FFLAGS_I8'] = ' -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8'
-+
++
+ self.cfg['F90FLAGS'] = '-O2'
+ if self.cfg.get('F90'):
+ self.cfg['F90FLAGS'] += ' -ffixed-line-length-0 -x f77-cpp-input'
@@ -7118,27 +7149,24 @@
+ self.cfg['FFLAGS_DBG'] = self.cfg['FFLAGS'].replace('-O2', '-g ')
+ self.cfg['F90FLAGS_DBG'] = self.cfg['F90FLAGS'].replace('-O2', '-g ')
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
+class GNU_without_MATH_COMPILER(GNU_COMPILER):
+ """GNU compilers without mathematical libraries."""
+
+ def __init__(self, **kargs):
+ """Initialization."""
+ CONFIGURE_COMPILER.__init__(self, **kargs)
-+
++
+ if self.platform == 'LINUX64':
+ self.F77 = 'gfortran'
-+
+
+ def after_compilers(self):
+ """Define libs to search."""
+ self.libs.extend([('cxx', ['libstdc++.so', 'libstdc++.a']),])
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
+class INTEL_COMPILER(CONFIGURE_COMPILER):
-+ """Intel compilers"""
++ """Intel compilers"""
+ CC = 'icc'
+ CXX = 'icpc'
+ F77 = 'ifort'
@@ -7147,11 +7175,9 @@
+ def __init__(self, **kargs):
+ """Initialization."""
+ CONFIGURE_COMPILER.__init__(self, **kargs)
-+
+ self.is_v11 = False
+ self.is_v12 = False
+ self.src_mkl = True
-+
+
+ def after_compilers(self):
+ """Define libs to search."""
@@ -7196,13 +7222,11 @@
+ self.libs.append(('sys', 'pthread')) # pthread must appear after guide
+ self.libs.extend([('cxx', ['libstdc++.so', 'libstdc++.a']),])
+
-+
+ def after_libs(self):
+ """Add start/end group option around mathlib."""
+ if self.is_v11 or self.is_v12:
+ self.cfg['__LIBS_math_000_start'] = "-Wl,--start-group"
+ self.cfg['__LIBS_math_999_end'] = "-Wl,--end-group"
-+
+
+ def check_env(self):
+ """Check for environment profiles."""
@@ -7249,10 +7273,10 @@
+ else:
+ # from '/opt/intel/fc/9.1.045/bin/ifort', add '/opt/intel'
+ search_paths.append(os.path.normpath(os.path.join(self.cfg['CC'], os.pardir, os.pardir, os.pardir, os.pardir)))
-+
++
+ self._print('add_arch =', repr(add_arch), '; src_mkl =', repr(self.src_mkl),
+ '; intel_arch =', repr(intel_arch), '; mkl_src_name =', repr(mkl_src_name), DBG=True)
-+
++
+ if self.src_mkl:
+ self.profiles.append(mkl_src_name)
+ for prof in self.profiles:
@@ -7268,10 +7292,9 @@
+ self.cfg['OPT_ENV'] += os.linesep
+ self.cfg['OPT_ENV'] += "export INTEL_LICENSE_FILE='%s'" % os.environ['INTEL_LICENSE_FILE']
+ self.cfg['OPT_ENV'] = self.cfg['OPT_ENV'].strip()
-+
++
+ CONFIGURE_COMPILER.check_env(self)
+
-+#-------------------------------------------------------------------------------
+ def set_flags(self):
+ """Set compiler options."""
+ self.cfg['DEFINED'] += '_USE_INTEL_IFORT _USE_OPENMP _DISABLE_MATHLIB_FPE'
@@ -7293,15 +7316,13 @@
+ self.cfg['FFLAGS_DBG'] = self.cfg['FFLAGS'].replace('-O3', '-g ')
+ self.cfg['F90FLAGS_DBG'] = self.cfg['F90FLAGS'].replace('-O3', '-g ')
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
+class INTEL_without_MATH_COMPILER(INTEL_COMPILER):
-+ """Intel compilers without mathematical libraries."""
-+#-------------------------------------------------------------------------------
++ """Intel compilers without mathematical libraries."""
++
+ def __init__(self, **kargs):
+ """Initialization."""
+ INTEL_COMPILER.__init__(self, **kargs)
-+
+
+ def after_compilers(self):
+ """Define libs to search."""
@@ -7310,20 +7331,113 @@
+ self.libs.append(('sys', 'pthread')) # pthread must appear after guide
+ self.libs.extend([('cxx', ['libstdc++.so', 'libstdc++.a']),])
+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++
++class OPEN64_COMPILER(CONFIGURE_COMPILER):
++ """Open64 compilers."""
++ CC = 'opencc'
++ CXX = 'openCC'
++ F77 = 'openf90'
++ F90 = 'openf90'
++
++ def __init__(self, **kargs):
++ """Initialization."""
++ CONFIGURE_COMPILER.__init__(self, **kargs)
++
++ def after_compilers(self):
++ """Define libs to search."""
++ self.libs.extend([('math', 'lapack'), ('math', 'blas'),
++ ('cxx', ['libstdc++.so', 'libstdc++.a']),])
++
++ def set_flags(self):
++ """Set compiler options."""
++ self.cfg['CFLAGS'] = '-O'
++ self.cfg['FFLAGS'] = '-O'
++ self.cfg['F90FLAGS'] = '-O'
++ if self.platform == 'LINUX64':
++ self.cfg['FFLAGS_I8'] = ' -i8 -r8'
++ self.cfg['F90FLAGS_I8'] = ' -i8 -r8'
++
++ self.insert_option('-openmp')
++ self.insert_option('-fPIC')
++ self.cfg['CFLAGS_DBG'] = self.cfg['CFLAGS'].replace('-O', '-g ')
++ self.cfg['FFLAGS_DBG'] = self.cfg['FFLAGS'].replace('-O', '-g ')
++ self.cfg['F90FLAGS_DBG'] = self.cfg['F90FLAGS'].replace('-O', '-g ')
++
++
++class OPEN64_without_MATH_COMPILER(OPEN64_COMPILER):
++ """Open64 compilers without mathematical libraries."""
++
++ def __init__(self, **kargs):
++ """Initialization."""
++ CONFIGURE_COMPILER.__init__(self, **kargs)
++
++ def after_compilers(self):
++ """Define libs to search."""
++ self.libs.extend([('cxx', ['libstdc++.so', 'libstdc++.a']),])
++
++
++class PATHSCALE_COMPILER(CONFIGURE_COMPILER):
++ """Pathscale compilers."""
++ CC = 'pathcc'
++ CXX = 'pathCC'
++ F77 = 'pathf90'
++ F90 = 'pathf90'
++
++ def __init__(self, **kargs):
++ """Initialization."""
++ CONFIGURE_COMPILER.__init__(self, **kargs)
++
++ def after_compilers(self):
++ """Define libs to search."""
++ self.libs.extend([('math', 'lapack'), ('math', 'blas'),
++ ('cxx', ['libstdc++.so', 'libstdc++.a']),])
++
++ def set_flags(self):
++ """Set compiler options."""
++ self.cfg['CFLAGS'] = '-O'
++ self.cfg['FFLAGS'] = '-O'
++ self.cfg['F90FLAGS'] = '-O'
++ if self.platform == 'LINUX64':
++ self.cfg['FFLAGS_I8'] = ' -i8 -r8'
++ self.cfg['F90FLAGS_I8'] = ' -i8 -r8'
++
++ self.insert_option('-openmp')
++ self.insert_option('-fPIC')
++ self.cfg['CFLAGS_DBG'] = self.cfg['CFLAGS'].replace('-O', '-g ')
++ self.cfg['FFLAGS_DBG'] = self.cfg['FFLAGS'].replace('-O', '-g ')
++ self.cfg['F90FLAGS_DBG'] = self.cfg['F90FLAGS'].replace('-O', '-g ')
++
++
++class PATHSCALE_without_MATH_COMPILER(PATHSCALE_COMPILER):
++ """Pathscale compilers without mathematical libraries."""
++
++ def __init__(self, **kargs):
++ """Initialization."""
++ CONFIGURE_COMPILER.__init__(self, **kargs)
++
++ def after_compilers(self):
++ """Define libs to search."""
++ self.libs.extend([('cxx', ['libstdc++.so', 'libstdc++.a']),])
++
++
+dict_name = {
+ 'INTEL' : INTEL_COMPILER,
+ 'GNU' : GNU_COMPILER,
++ 'OPEN64' : OPEN64_COMPILER,
++ 'PATHSCALE' : PATHSCALE_COMPILER,
+ 'INTEL_WITHOUT_MATH' : INTEL_without_MATH_COMPILER,
+ 'GNU_WITHOUT_MATH' : GNU_without_MATH_COMPILER,
++ 'OPEN64_WITHOUT_MATH' : OPEN64_without_MATH_COMPILER,
++ 'PATHSCALE_WITHOUT_MATH' : PATHSCALE_without_MATH_COMPILER,
+}
+
-+global_pref_order = ['INTEL', 'GNU', 'INTEL_WITHOUT_MATH', 'GNU_WITHOUT_MATH']
-+
-+
-+#-------------------------------------------------------------------------------
-+#-------------------------------------------------------------------------------
++global_pref_order = [
++ 'INTEL', 'GNU', 'OPEN64', 'PATHSCALE',
++ 'INTEL_WITHOUT_MATH', 'GNU_WITHOUT_MATH',
++ 'OPEN64_WITHOUT_MATH', 'PATHSCALE_WITHOUT_MATH',
++]
++
++
+class COMPILER_MANAGER:
+ """Manager multiple compilers during installation.
+ """
@@ -7340,13 +7454,11 @@
+ self.debug = debug
+ self.print_func = print_func
+
-+
+ def _print(self, *args, **kargs):
+ if self.print_func:
+ self.print_func(*args, **kargs)
+ else:
+ print args, kargs
-+
+
+ def configure(self, **kargs):
+ """Configure a compiler.
@@ -7368,16 +7480,15 @@
+ self._print("_global_cfg : ", self._global_cfg, DBG=True)
+ else:
+ conf.fcheck('ok (already configured)', conf.__doc__)
-+
++
+ success = conf.check_ok()
+ if success:
+ self.config[product] = conf
+ self.config[name] = conf
+ # if __main__ is not yet defined
+ self.config['__main__'] = self.config.get('__main__', conf)
-+
++
+ return success
-+
+
+ def check_compiler(self, **kargs):
+ """Try to configure a compiler. Stops at first success.
@@ -7399,7 +7510,7 @@
+ for name in global_pref_order:
+ if name not in l_search:
+ l_search.append(name)
-+
++
+ success = False
+ for name in l_search:
+ kargs['name'] = name
@@ -7408,11 +7519,9 @@
+ break
+ return success
+
-+
+ def get_config(self, product=None):
+ """Return config dict."""
+ return self.config.get(product, self.config.get('__main__')).cfg
-+
+
+ def switch_in_dep(self, dependency_object, product, system=None, verbose=False):
+ """Change 'cfg' attribute of the dependency_object.
@@ -7420,19 +7529,19 @@
+ __dbgsw = False
+ cfg = dependency_object.cfg
+ compiler_cfg = self.get_config(product)
-+ if __dbgsw:
++ if __dbgsw:
+ print '#SWITCH switch cfg pour %s' % product
+ pprint(cfg)
+ print '#SWITCH compiler_cfg'
+ pprint(compiler_cfg)
+ print '#SWITCH _first_values'
+ pprint(self._first_values)
-+
++
+ # first time store initial values
+ if self._first_switch:
+ for attr in self._overwritten_attrs:
+ if cfg.get(attr) is not None:
-+ if __dbgsw:
++ if __dbgsw:
+ print '#SWITCH init cfg[%s] = %s' % (attr, cfg.get(attr))
+ self._first_values[attr] = cfg[attr]
+ self._first_switch = False
@@ -7459,7 +7568,7 @@
+ # re-init values defined by compilers
+ for attr in self._compilers_attrs:
+ cfg[attr] = ''
-+
++
+ # copy values if not already in cfg
+ math_lib = []
+ cxx_lib = []
@@ -7511,11 +7620,11 @@
+ cfg['DEFINED'] = cfg['DEFINED'].strip()
+ if __dbgsw:
+ print ' new=%s' % cfg['DEFINED']
-+
++
+ cfg['OPT_ENV'] = self._first_values.get('OPT_ENV', '')
+ if __dbgsw:
+ print '#SWITCH opt_env old=%s' % cfg['OPT_ENV']
-+
++
+ if cfg['OPT_ENV'].strip() != compiler_cfg.get('OPT_ENV', '').strip():
+ if cfg['OPT_ENV']:
+ cfg['OPT_ENV'] += os.linesep
@@ -7529,7 +7638,7 @@
+ # set new cfg dict and store output values
+ dependency_object.cfg = cfg
+ self._out_values = cfg.copy()
-+
++
+ txtdbg = os.linesep.join(['#SWITCH sortie cfg pour %s' % product, pformat(cfg)])
+ if self.debug:
+ open('cfg_%s' % product, 'w').write(txtdbg)
@@ -7558,11 +7667,10 @@
+ if verbose:
+ return os.linesep.join(txt)
+
-+
Index: aster-11.0.10-1/check_compilers_src.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/check_compilers_src.py 2011-02-15 10:09:12.000000000 +0100
++++ aster-11.0.10-1/check_compilers_src.py 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,96 @@
+"""
+This module contains source code for testing compilers, libs...
@@ -7663,7 +7771,7 @@
Index: aster-11.0.10-1/check_popen_thread.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/check_popen_thread.py 2011-02-15 10:09:12.000000000 +0100
++++ aster-11.0.10-1/check_popen_thread.py 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,50 @@
+"""
+Provoke the Popen bug.
@@ -7718,7 +7826,7 @@
Index: aster-11.0.10-1/mprint.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/mprint.py 2011-02-15 10:09:13.000000000 +0100
++++ aster-11.0.10-1/mprint.py 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -7821,7 +7929,7 @@
Index: aster-11.0.10-1/post_install.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/post_install.py 2011-02-15 10:09:14.000000000 +0100
++++ aster-11.0.10-1/post_install.py 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,181 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -8007,8 +8115,8 @@
Index: aster-11.0.10-1/products.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/products.py 2011-02-15 10:09:14.000000000 +0100
-@@ -0,0 +1,1265 @@
++++ aster-11.0.10-1/products.py 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,1255 @@
+# -*- coding: utf-8 -*-
+# ==============================================================================
+# COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
@@ -8039,7 +8147,7 @@
+
+import sys
+import os
-+import os.path
++import os.path as osp
+import shutil
+import re
+from products_versions import dict_prod, dict_prod_param
@@ -8056,6 +8164,7 @@
+ export_parameters,
+ relative_symlink,
+ SetupInstallError,
++ unexpandvars,
+)
+
+# ----- differ messages translation
@@ -8104,9 +8213,9 @@
+ req=['ASTER_ROOT',],
+ set=['HOME_HDF',],
+ )
-+ cfg['HOME_HDF'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_HDF'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_HDF'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_HDF'], 'bin'))
+
+ # ----- setup instance
+ setup=SETUP(
@@ -8127,12 +8236,6 @@
+ }),
+ ('Make' , { 'nbcpu' : ftools.nbcpu }),
+ ('Install' , {}),
-+ ('ChgFiles' , {
-+ 'files' : ['bin/h5cc', 'lib/libhdf5.settings', 'lib/lib*.la'],
-+ 'path' : '__setup.installdir__',
-+ 'postinst' : kargs['postinst'],
-+ 'only_post' : True,
-+ }),
+ ('Clean' , {}),
+ ),
+
@@ -8153,9 +8256,9 @@
+ req=['ASTER_ROOT', 'HOME_HDF', 'OTHERLIB', 'CXXLIB',],
+ set=['HOME_MED',],
+ )
-+ cfg['HOME_MED']=os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_MED']=osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_MED'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_MED'], 'bin'))
+
+ ldflags = cfg['OTHERLIB'] + ' ' + cfg['CXXLIB']
+ disable_shared = ''
@@ -8185,11 +8288,6 @@
+ }),
+ ('Make' , { 'nbcpu' : ftools.nbcpu }),
+ ('Install' , {}),
-+ ('ChgFiles' , {
-+ 'files' : ['bin/xmdump'],
-+ 'postinst' : kargs['postinst'],
-+ 'only_post' : True,
-+ }),
+ ('Clean' , {}),
+ ),
+
@@ -8211,13 +8309,13 @@
+ req=[],
+ set=['HOME_NUMPY'],
+ )
-+ cfg['HOME_NUMPY'] = GetSitePackages(os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name))
-+
++ cfg['HOME_NUMPY'] = GetSitePackages(osp.join(cfg['ASTER_ROOT'], 'public', pkg_name))
++
+ # fill PYTHONPATH
+ ftools=kargs['find_tools']
+ ftools.AddToPathVar(cfg, 'PYTHONPATH', cfg['HOME_NUMPY'])
-+ ftools.AddToPathVar(cfg, 'PYTHONPATH', os.path.join(cfg['HOME_NUMPY'], 'Numeric'))
-+ ftools.AddToPath('lib', os.path.join(cfg['HOME_NUMPY'], 'Numeric'))
++ ftools.AddToPathVar(cfg, 'PYTHONPATH', osp.join(cfg['HOME_NUMPY'], 'Numeric'))
++ ftools.AddToPath('lib', osp.join(cfg['HOME_NUMPY'], 'Numeric'))
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8250,16 +8348,16 @@
+ req=['ASTER_ROOT',],
+ set=['HOME_OMNIORB',],
+ )
-+ cfg['HOME_OMNIORB'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_OMNIORB'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_OMNIORB'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_OMNIORB'], 'bin'))
+
+ # set PYTHON variable
+ os.environ['PYTHON'] = cfg['PYTHON_EXE']
+ # fill PYTHONPATH
-+ ftools.AddToPathVar(cfg, 'PYTHONPATH', os.path.join(GetSitePackages(cfg['HOME_OMNIORB']), 'omniidl_be'))
++ ftools.AddToPathVar(cfg, 'PYTHONPATH', osp.join(GetSitePackages(cfg['HOME_OMNIORB']), 'omniidl_be'))
+ ftools.AddToPath('lib', GetSitePackages(cfg['HOME_OMNIORB']))
-+
++
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8274,9 +8372,9 @@
+ ('Extract' , {}),
+ ('Configure', {
+ 'command' : 'mkdir build ; cd build ; ../configure --prefix=%s --disable-ipv6' % cfg['HOME_OMNIORB'] }),
-+ ('Make' , { 'path' : os.path.join('__setup.workdir__', '__setup.content__', 'build'),
++ ('Make' , { 'path' : osp.join('__setup.workdir__', '__setup.content__', 'build'),
+ 'nbcpu' : ftools.nbcpu }),
-+ ('Install' , { 'path' : os.path.join('__setup.workdir__', '__setup.content__', 'build') }),
++ ('Install' , { 'path' : osp.join('__setup.workdir__', '__setup.content__', 'build') }),
+ ('Clean' , {}),
+ ),
+
@@ -8300,7 +8398,7 @@
+ os.environ['PYTHON'] = cfg['PYTHON_EXE']
+ # fill PYTHONPATH
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PYTHONPATH', os.path.join(GetSitePackages(cfg['HOME_OMNIORB']), 'omniidl_be'))
++ ftools.AddToPathVar(cfg, 'PYTHONPATH', osp.join(GetSitePackages(cfg['HOME_OMNIORB']), 'omniidl_be'))
+ ftools.AddToPathVar(cfg, 'PYTHONPATH', GetSitePackages(cfg['HOME_OMNIORB']))
+ ftools.AddToPath('lib', GetSitePackages(cfg['HOME_OMNIORB']))
+ # ----- setup instance
@@ -8317,9 +8415,9 @@
+ ('Configure', {
+ 'command' : 'mkdir build ; cd build ; ../configure --prefix=%s --disable-ipv6 --with-omniorb=%s' \
+ % (cfg['HOME_OMNIORB'], cfg['HOME_OMNIORB']) }),
-+ ('Make' , { 'path' : os.path.join('__setup.workdir__', '__setup.content__', 'build'),
++ ('Make' , { 'path' : osp.join('__setup.workdir__', '__setup.content__', 'build'),
+ 'nbcpu' : ftools.nbcpu }),
-+ ('Install' , { 'path' : os.path.join('__setup.workdir__', '__setup.content__', 'build') }),
++ ('Install' , { 'path' : osp.join('__setup.workdir__', '__setup.content__', 'build') }),
+ ('Clean' , {}),
+ ),
+
@@ -8340,12 +8438,12 @@
+ dep.Add(product,
+ req=['HOME_OMNIORB', 'SALOME_VERSION'],
+ )
-+ cfg['HOME_PYLOTAGE'] = GetSitePackages(os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name))
++ cfg['HOME_PYLOTAGE'] = GetSitePackages(osp.join(cfg['ASTER_ROOT'], 'public', pkg_name))
+
+ # fill PYTHONPATH
+ ftools=kargs['find_tools']
+ ftools.AddToPathVar(cfg, 'PYTHONPATH', cfg['HOME_PYLOTAGE'])
-+
++
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8358,7 +8456,7 @@
+ actions=(
+ ('Extract' , {}),
+ ('PyInstall', { 'global_opts' : '--salome=%s --with-omniidl=%s' \
-+ % (cfg['SALOME_VERSION'], os.path.join(cfg['HOME_OMNIORB'], 'bin', 'omniidl')) }),
++ % (cfg['SALOME_VERSION'], osp.join(cfg['HOME_OMNIORB'], 'bin', 'omniidl')) }),
+ ('Clean', {}),
+ ),
+
@@ -8379,9 +8477,9 @@
+ req=['ASTER_ROOT', 'TOOLS_DIR',],
+ set=['HOME_GMSH',]
+ )
-+ cfg['HOME_GMSH'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_GMSH'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_GMSH'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_GMSH'], 'bin'))
+
+ # ----- setup instance
+ setup=SETUP(
@@ -8408,7 +8506,7 @@
+ ),
+
+ installdir = cfg['HOME_GMSH'],
-+ workdir = os.path.join(cfg['HOME_GMSH'], os.pardir),
++ workdir = osp.join(cfg['HOME_GMSH'], os.pardir),
+ sourcedir = cfg['SOURCEDIR'],
+ )
+ return setup
@@ -8425,9 +8523,9 @@
+ req=['ASTER_ROOT', 'TOOLS_DIR',],
+ set=['HOME_GRACE',]
+ )
-+ cfg['HOME_GRACE'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_GRACE'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_GRACE'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_GRACE'], 'bin'))
+
+ # ----- check for libXm
+ ftools.findlib_and_set(cfg, 'X11LIB', 'Xm',
@@ -8438,12 +8536,16 @@
+ """Add the link to xmgrace or grace."""
+ done = False
+ for f in ('xmgrace', 'grace'):
-+ exe = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name, 'grace', 'bin', f)
-+ if os.path.exists(exe):
-+ dest = os.path.join(cfg['TOOLS_DIR'], 'xmgrace')
-+ if os.path.exists(dest):
++ exe = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name, 'grace', 'bin', f)
++ if osp.exists(exe):
++ dest = osp.join(cfg['TOOLS_DIR'], 'xmgrace')
++ if osp.exists(dest):
+ os.remove(dest)
+ relative_symlink(exe, dest)
++ grbat = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name, 'grace', 'bin', 'gracebat')
++ if osp.exits(grbat):
++ exe = grbat
++ relative_symlink(exe, osp.join(cfg['TOOLS_DIR'], 'gracebat'))
+ done = True
+ break
+ if not done:
@@ -8488,7 +8590,7 @@
+ req=['ASTER_ROOT', 'TOOLS_DIR', 'PYTHON_EXE'],
+ set=['HOME_GIBI']
+ )
-+ cfg['HOME_GIBI'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_GIBI'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+
+ # ----- setup instance
+ setup=SETUP(
@@ -8502,13 +8604,6 @@
+
+ actions=(
+ ('Extract' , {}),
-+ ('ChgFiles' , {
-+ 'files' : ['gibi_aster.py'],
-+ 'path' : cfg['HOME_GIBI'],
-+ 'dtrans' : cfg,
-+ 'postdest' : cfg['HOME_GIBI'],
-+ 'postinst' : kargs['postinst'],
-+ }),
+ ('Chmod' , {
+ 'files' : ['gibi_aster.py', 'gibi%s' % version, 'gibiPC_Linux_%s' % version],
+ 'path' : cfg['HOME_GIBI'],
@@ -8532,7 +8627,7 @@
+ ),
+
+ installdir = cfg['HOME_GIBI'],
-+ workdir = os.path.join(cfg['HOME_GIBI'], os.pardir),
++ workdir = osp.join(cfg['HOME_GIBI'], os.pardir),
+ sourcedir = cfg['SOURCEDIR'],
+ )
+ return setup
@@ -8563,7 +8658,7 @@
+ paths=cfg.get('HOME_TCL_TK', []),)
+ ftools.CheckFromLastFound(cfg, 'HOME_TCL_TK', 'bin')
+ if not cfg.has_key('HOME_TCL_TK'):
-+ cfg['HOME_TCL_TK']=os.path.abspath(os.path.join(cfg['WISH_EXE'],os.pardir,os.pardir))
++ cfg['HOME_TCL_TK']=osp.abspath(osp.join(cfg['WISH_EXE'],os.pardir,os.pardir))
+
+ # specific values for 'ASTK_SERV' files
+ astk_cfg=cfg.copy()
@@ -8577,7 +8672,7 @@
+ # fill PYTHONPATH
+ ftools=kargs['find_tools']
+ ftools.AddToPathVar(cfg, 'PYTHONPATH', GetSitePackages(cfg['ASTER_ROOT']))
-+
++
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8594,7 +8689,7 @@
+ 'filename' : 'external_configuration.py',
+ 'dict_cfg' : astk_cfg,
+ }),
-+ ('PyInstall', {}),
++ ('PyInstall', { 'cmd_opts' : '--force' }),
+ ('Clean', {}),
+ ),
+
@@ -8615,7 +8710,7 @@
+ req=['ASTER_ROOT',],
+ set=['HOME_METIS',],
+ )
-+ cfg['HOME_METIS'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_METIS'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+
+ # ----- setup instance
+ setup=SETUP(
@@ -8633,7 +8728,6 @@
+ ('ChgFiles' , {
+ 'files' : ['Makefile.in'],
+ 'dtrans' : cfg,
-+ 'postinst' : kargs['postinst'],
+ }),
+ ('Make' , { 'nbcpu' : kargs['find_tools'].nbcpu }),
+ ('Install' , {
@@ -8660,25 +8754,25 @@
+ req=['TOOLS_DIR',],
+ set=['HOME_METIS_EDF',],
+ )
-+ cfg['HOME_METIS_EDF'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_METIS_EDF'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ ftools=kargs['find_tools']
-+ ftools.AddToPathVar(cfg, 'PATH', os.path.join(cfg['HOME_METIS_EDF'], 'bin'))
++ ftools.AddToPathVar(cfg, 'PATH', osp.join(cfg['HOME_METIS_EDF'], 'bin'))
+ # add integer*8 and openmp flags
+ add_flags(cfg, ['OPENMP', 'I8'])
+
+ def metisInstall(self, **kargs):
+ """'make install' method for metis
+ """
-+ dest = os.path.join(cfg['HOME_METIS_EDF'], 'bin')
-+ if not os.path.exists(dest):
++ dest = osp.join(cfg['HOME_METIS_EDF'], 'bin')
++ if not osp.exists(dest):
+ os.makedirs(dest)
+ for f in ('onmetis', 'pmetis', 'kmetis', 'onmetis.exe'):
+ shutil.copy(f, dest)
+ for f in ('onmetis', 'pmetis', 'kmetis'):
-+ dest = os.path.join(cfg['TOOLS_DIR'], f)
-+ if os.path.exists(dest):
++ dest = osp.join(cfg['TOOLS_DIR'], f)
++ if osp.exists(dest):
+ os.remove(dest)
-+ relative_symlink(os.path.join(cfg['HOME_METIS_EDF'], 'bin', f), dest)
++ relative_symlink(osp.join(cfg['HOME_METIS_EDF'], 'bin', f), dest)
+
+ # ----- setup instance
+ setup=SETUP(
@@ -8693,15 +8787,19 @@
+
+ actions=(
+ ('Extract' , {}),
-+ ('Make' , {}), # does not support the -j flag
++ ('Make' , {
++ 'command' : 'make onmetis.exe pmetis kmetis',
++ 'nbcpu' : 1,
++ }), # does not support the -j flag
+ ('Install' , {
+ 'external' : metisInstall,
+ }),
+ ('Chmod' , {
-+ 'path' : os.path.join(cfg['HOME_METIS_EDF'], 'bin'),
++ 'path' : osp.join(cfg['HOME_METIS_EDF'], 'bin'),
+ 'files' : ['onmetis', 'onmetis.exe', 'pmetis', 'kmetis'],
+ 'mode' : 0755,
+ }),
++ ('Make' , { 'command' : 'make tests', }),
+ ('Clean', {}),
+ ),
+
@@ -8726,8 +8824,8 @@
+ req=['ASTER_ROOT', 'TOOLS_DIR',],
+ set=['HOME_EFICAS'],
+ )
-+ cfg['HOME_EFICAS'] = os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
-+
++ cfg['HOME_EFICAS'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++
+ try:
+ import PyQt4
+ default = 'Qt'
@@ -8748,35 +8846,38 @@
+
+ actions=(
+ ('Extract' , {}),
++ # make symlinks in ASTER_ROOT/bin and TOOLS_DIR.
++ # TOOLS_DIR kept for compatibility (change astkrc/outils)
+ ('Install' , {
-+ 'command' : "rm -f %(tooldir)s/eficasTk ; " \
-+ "cat << EOF > %(tooldir)s/eficasTk\n%(script)s\nEOF" % \
-+ { 'tooldir' : cfg['TOOLS_DIR'],
-+ 'script' : shell_escape(eficasTk_run) } }),
++ 'path' : osp.join(cfg['ASTER_ROOT'], 'bin'),
++ 'command' : "rm -f eficas eficasTk eficasQt ; " \
++ "ln -sf ../public/%(pkg)s/eficasQt . ;" \
++ "ln -sf ../public/%(pkg)s/eficasTk . ;" \
++ % { 'pkg' : pkg_name},
++ }),
+ ('Install' , {
-+ 'command' : "rm -f %(tooldir)s/eficasQt ; " \
-+ "cat << EOF > %(tooldir)s/eficasQt\n%(script)s\nEOF" % \
-+ { 'tooldir' : cfg['TOOLS_DIR'],
-+ 'script' : shell_escape(eficasQt_run) } }),
++ 'path' : osp.join(cfg['ASTER_ROOT'], 'bin'),
++ 'command' : "ln -sf eficas%(default)s eficas" \
++ % { 'default' : default }
++ }),
+ ('Install' , {
-+ 'command' : "cd %(tooldir)s ; rm -f eficas ; ln -sf eficas%(default)s eficas" % \
-+ { 'tooldir' : cfg['TOOLS_DIR'], 'default' : default } }),
-+ ('Chmod' , {
-+ 'files' : ['eficasTk', 'eficasQt'],
-+ 'path' : cfg['TOOLS_DIR'],
-+ 'mode' : 0755,
++ # TOOLS_DIR kept for compatibility (change astkrc/outils)
++ 'path' : cfg['TOOLS_DIR'],
++ 'command' : "rm -f eficas eficasTk eficasQt ; " \
++ "ln -sf ../public/%(pkg)s/eficasQt . ;" \
++ "ln -sf ../public/%(pkg)s/eficasTk . ;" \
++ % { 'pkg' : pkg_name},
++ }),
++ ('Install' , {
++ 'path' : cfg['TOOLS_DIR'],
++ 'command' : "ln -sf eficas%(default)s eficas" \
++ % { 'default' : default }
+ }),
+ ('PyCompile', { 'path' : cfg['HOME_EFICAS'], }),
-+ ('ChgFiles' , {
-+ 'files' : ['eficasTk', 'eficasQt'],
-+ 'path' : cfg['TOOLS_DIR'],
-+ 'postinst' : kargs['postinst'],
-+ 'only_post' : True,
-+ }),
+ ),
+
+ installdir = cfg['HOME_EFICAS'],
-+ workdir = os.path.join(cfg['HOME_EFICAS'], os.pardir),
++ workdir = osp.join(cfg['HOME_EFICAS'], os.pardir),
+ sourcedir = cfg['SOURCEDIR'],
+ )
+ return setup
@@ -8794,7 +8895,7 @@
+ dep.Add(product,
+ req=['ASTER_ROOT', 'HOME_EFICAS',],
+ )
-+
++
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8810,7 +8911,7 @@
+ ),
+
+ installdir = cfg['HOME_EFICAS'],
-+ workdir = os.path.join(cfg['HOME_EFICAS'], os.pardir),
++ workdir = osp.join(cfg['HOME_EFICAS'], os.pardir),
+ sourcedir = cfg['SOURCEDIR'],
+ )
+ return setup
@@ -8827,11 +8928,11 @@
+ req=['ASTER_ROOT', 'FLEX', 'RANLIB', 'YACC'],
+ set=['HOME_SCOTCH',],
+ )
-+ cfg['HOME_SCOTCH']=os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
-+
++ cfg['HOME_SCOTCH']=osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++
+ scotch_cfg = {}.fromkeys(['CC', 'CFLAGS', 'FLEX', 'RANLIB', 'YACC'], '')
+ scotch_cfg.update(cfg)
-+
++
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
@@ -8845,16 +8946,13 @@
+ actions=(
+ ('Extract' , {}),
+ ('ChgFiles' , {
-+ 'files' : [os.path.join('src', 'Makefile.inc'), ],
++ 'files' : [osp.join('src', 'Makefile.inc'), ],
+ 'dtrans' : scotch_cfg,
+ }),
-+ ('Make' , {'command' : 'make all && make install',
-+ 'path' : [os.path.join('__setup.workdir__', '__setup.content__', 'src', 'common'),
-+ os.path.join('__setup.workdir__', '__setup.content__', 'src', 'libscotch')],
-+ 'nbcpu' : 1 }), # seems not support "-j NBCPU" option
-+ ('Install', {'command' : 'mkdir -p %(HOME_SCOTCH)s/include %(HOME_SCOTCH)s/lib ; ' \
-+ 'cp bin/*.a %(HOME_SCOTCH)s/lib/ ; cp bin/*.h %(HOME_SCOTCH)s/include/ ; ' \
-+ 'cp src/Makefile.inc %(HOME_SCOTCH)s/' % cfg}),
++ ('Make' , {'path' : osp.join('__setup.workdir__', '__setup.content__', 'src'),
++ 'nbcpu' : 1 }), # seems not support "-j NBCPU" option
++ ('Install', {'command' : 'make install prefix=%s' % cfg['HOME_SCOTCH'],
++ 'path' : osp.join('__setup.workdir__', '__setup.content__', 'src') }),
+ ('Clean', {}),
+ ),
+
@@ -8875,7 +8973,7 @@
+ req=['ASTER_ROOT', 'CC', 'F90', 'LD', 'INCLUDE_MUMPS', 'MATHLIB', 'HOME_METIS'],
+ set=['HOME_MUMPS',],
+ )
-+ cfg['HOME_MUMPS']=os.path.join(cfg['ASTER_ROOT'], 'public', pkg_name)
++ cfg['HOME_MUMPS']=osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+ add_flags(cfg, 'OPENMP')
+ mumps_cfg = {}.fromkeys(['CFLAGS', 'F90FLAGS', 'LDFLAGS'], '')
+ mumps_cfg.update(cfg)
@@ -8895,7 +8993,6 @@
+ ('ChgFiles' , {
+ 'files' : ['Makefile.inc'],
+ 'dtrans' : mumps_cfg,
-+ 'postinst' : kargs['postinst'],
+ }),
+ ('Make' , {
+ 'command' : 'make all',
@@ -8949,26 +9046,26 @@
+ cfg['OPT_ENV'] = cfg.get('OPT_ENV', '')
+ cfg['OPT_ENV'] = '#?OPT_ENV?\n\n' + cfg['OPT_ENV']
+ ftools=kargs['find_tools']
-+
++
+ # ----- add path to Code_Aster headers
-+ cfg['CINCLUDE'] = '-I%s' % os.path.join(cfg['ASTER_ROOT'], cfg['ASTER_VERSION'], 'bibc', 'include')
++ cfg['CINCLUDE'] = '-I%s' % osp.join(cfg['ASTER_ROOT'], cfg['ASTER_VERSION'], 'bibc', 'include')
+ # ----- check for Python headers
+ ftools.find_and_set(cfg, 'CINCLUDE', 'Python.h',
-+ [os.path.join(cfg['HOME_PYTHON'], 'include', 'python'+sys.version[:3])],
++ [osp.join(cfg['HOME_PYTHON'], 'include', 'python'+sys.version[:3])],
+ typ='inc', err=True, append=True, reqpkg="python-dev")
+ # ----- check for Python/numpy headers
+ if cfg['USE_NUMPY']:
-+ num_h = os.path.join('numpy', 'arrayobject.h')
++ num_h = osp.join('numpy', 'arrayobject.h')
+ ftools.find_and_set(cfg, 'CINCLUDE', num_h,
-+ [os.path.join(cfg['HOME_NUMPY'], 'numpy', 'core', 'include')],
++ [osp.join(cfg['HOME_NUMPY'], 'numpy', 'core', 'include')],
+ typ='inc', err=True, append=True, prefix_to='numpy', reqpkg="python-numpy")
+ else:
+ # ----- check for Python/Numeric headers
-+ l_num_h = [os.path.join('python'+sys.version[:3], 'Numeric', 'arrayobject.h'),
-+ os.path.join('Numeric', 'arrayobject.h')]
++ l_num_h = [osp.join('python'+sys.version[:3], 'Numeric', 'arrayobject.h'),
++ osp.join('Numeric', 'arrayobject.h')]
+ ftools.find_and_set(cfg, 'CINCLUDE', l_num_h,
-+ [os.path.join(cfg['HOME_NUMPY'], 'include'),
-+ os.path.join(cfg['HOME_PYTHON'], 'include', 'python'+sys.version[:3])],
++ [osp.join(cfg['HOME_NUMPY'], 'include'),
++ osp.join(cfg['HOME_PYTHON'], 'include', 'python'+sys.version[:3])],
+ typ='inc', err=True, append=True, prefix_to='Numeric', reqpkg="python-numeric")
+
+ cxxlibs = []
@@ -8997,6 +9094,8 @@
+
+ # ----- check for MED and HDF5 libraries, and HDF5 includes
+ if cfg['HOME_HDF'] != '':
++ # while api 1.6 is used in Code_Aster
++ cfg['DEFINED'] += ' H5_USE_16_API'
+ ftools.findlib_and_set(cfg, 'HDFLIB', 'hdf5',
+ cfg['HOME_HDF'],
+ err=True, append=False)
@@ -9014,6 +9113,9 @@
+ cfg['HOME_MED'],
+ err=True, append=False)
+ ftools.CheckFromLastFound(cfg, 'HOME_MED', 'lib')
++ ftools.find_and_set(cfg, 'CINCLUDE', 'med.h',
++ cfg['HOME_MED'],
++ typ='inc', err=True, append=True)
+ else:
+ if cfg['DEFINED'].find('_DISABLE_HDF5') < 0:
+ cfg['DEFINED'] +=' _DISABLE_HDF5'
@@ -9042,7 +9144,7 @@
+ ftools.CheckFromLastFound(cfg, 'HOME_MUMPS', 'lib')
+ if cfg['HOME_METIS'] != '':
+ cfg['MUMPSLIB'] += " -L%s/lib -lmetis" % cfg['HOME_METIS']
-+ opt['F90INCLUDE'] += ' -I%s' % os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90',cfg['INCLUDE_MUMPS'])
++ opt['F90INCLUDE'] += ' -I%s' % osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90',cfg['INCLUDE_MUMPS'])
+ if cfg['HOME_MPI'] != '':
+ cfg['DEFINED'] += ' _USE_MPI_MUMPS'
+ else:
@@ -9088,7 +9190,7 @@
+
+ # ----- SCOTCH
+ if cfg['HOME_SCOTCH']<>'':
-+ for lib in ('common', 'scotch', 'scotcherr', 'scotcherrcom'):
++ for lib in ('esmumps', 'scotch', 'scotcherr'):
+ ftools.findlib_and_set(cfg, 'SCOTCHLIB', lib,
+ cfg['HOME_SCOTCH'],
+ err=True, append=True)
@@ -9105,23 +9207,23 @@
+ if less_than_version(dict_prod['aster'], '10.3') and \
+ cfg['NOBUILD'].find('bibc/scotch') < 0:
+ cfg['NOBUILD'] += ' bibc/scotch'
-+
++
+ # ----- omniORB
+ if cfg.get('HOME_OMNIORB', '') != '':
+ # to add 'HOME_OMNIORB'/lib to LD_LIBRARY_PATH
+ ftools.findlib_and_set(cfg, 'OMNIORBLIB', 'omniORB4',
+ cfg['HOME_OMNIORB'],
+ err=True)
-+
++
+ # use previous options only if there aren't set in cfg
+ for k,v in opt.items():
+ if not cfg.has_key(k):
+ cfg[k]=v
+ # add integer*8 and openmp flags
+ add_flags(cfg, ['OPENMP', 'I8'])
-+
++
+ log = kargs['log']
-+
++
+ def set_profile(self, **kargs):
+ """Write profile.sh in ASTER_VERSION.
+ """
@@ -9130,9 +9232,6 @@
+ return
+ fprof = chglist[0]
+ self.VerbStart(_('Setting %s') % fprof)
-+ if cfg['ENV_SH'] != '':
-+ cfg['ENV_SH'] += ' ; '
-+ cfg['ENV_SH'] += fprof
+ content = ['# profile for Code_Aster version %s' % self.version, '']
+ content.append('if [ -z "$DEFINE_PROFILE_ASTER_VERSION" ]; then')
+ content.append(' export DEFINE_PROFILE_ASTER_VERSION=done')
@@ -9158,14 +9257,19 @@
+ except (OSError, IOError), msg:
+ iret = 4
+ self.VerbEnd(iret)
-+
++
++ fprof = 'profile.sh'
++ if cfg['ENV_SH'] != '':
++ cfg['ENV_SH'] += ' ; '
++ cfg['ENV_SH'] += 'profile.sh'
++ unexpanded_cfg = unexpandvars(cfg, vars=('ASTER_ROOT', ))
+ # ----- setup instance
+ setup=SETUP(
+ product=product,
+ version=short_version,
+ description="""Code_Aster finite element method solver.""",
+ archive='aster-src-%s' % version,
-+ content='STA%s' % short_version,
++ content='NEW%s' % short_version, #XXX TO REPLACE BY STA !
+ depend=dep,
+ system=kargs['system'],
+ log=kargs['log'],
@@ -9174,19 +9278,24 @@
+ ('Extract' , { 'extract_as' : cfg['ASTER_VERSION'] }),
+ ('ChgFiles' , {
+ 'external' : set_profile,
-+ 'files' : ['profile.sh'],
-+ 'path' : os.path.join(cfg['ASTER_ROOT'], cfg['ASTER_VERSION']),
++ 'files' : [fprof, ],
++ 'path' : osp.join(cfg['ASTER_ROOT'], cfg['ASTER_VERSION']),
+ }),
+ ('ChgFiles' , {
-+ 'files' : ['config.txt', '*.export', 'Makefile*'],
-+ 'path' : os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
-+ 'postdest' : os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'files' : ['config.txt'],
++ 'path' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'postdest' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'dtrans' : unexpanded_cfg,
++ }),
++ ('ChgFiles' , {
++ 'files' : ['*.export', 'Makefile*'],
++ 'path' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'postdest' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
+ 'dtrans' : cfg,
-+ 'postinst' : kargs['postinst'],
+ }),
+ ('ChgFiles' , {
+ 'files' : ['aster'],
-+ 'path' : os.path.join(cfg['ASTER_ROOT'],'etc','codeaster'),
++ 'path' : osp.join(cfg['ASTER_ROOT'],'etc','codeaster'),
+ 'dtrans' : {'^ *vers : %s.*\n' % cfg['ASTER_VERSION'] : '',
+ },
+ 'delimiter' : '',
@@ -9195,29 +9304,21 @@
+ }),
+ ('ChgFiles' , {
+ 'files' : ['aster'],
-+ 'path' : os.path.join(cfg['ASTER_ROOT'],'etc','codeaster'),
++ 'path' : osp.join(cfg['ASTER_ROOT'],'etc','codeaster'),
+ 'dtrans' : {
+ re.escape('?vers : VVV?') : '?vers : VVV?\nvers : %s' % cfg['ASTER_VERSION'],
+ },
+ 'delimiter' : '', # that's why some ? have been added above
+ 'keep' : False,
+ }),
-+ ('ChgFiles' , {
-+ 'files' : [os.path.join('etc','codeaster','profile.sh'),
-+ os.path.join('etc','codeaster','profile.csh'),
-+ os.path.join(cfg['ASTER_VERSION'], 'profile.sh')],
-+ 'path' : cfg['ASTER_ROOT'],
-+ 'postinst' : kargs['postinst'],
-+ 'only_post' : True,
-+ }),
+ ('Install', {
-+ 'path' : os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'path' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
+ 'command' : 'ln -sf Makefile.asrun Makefile',
+ }),
+ ('Make' , {
-+ 'path' : os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
++ 'path' : osp.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION']),
+ 'command' : '%s --make --vers=%s' % \
-+ (os.path.join(cfg['ASTER_ROOT'],'bin','as_run'), cfg['ASTER_VERSION']),
++ (osp.join(cfg['ASTER_ROOT'],'bin','as_run'), cfg['ASTER_VERSION']),
+ 'capturestderr' : False,
+ }),
+ ),
@@ -9237,9 +9338,9 @@
+ pkg_name = '%s-%s' % (product, version)
+ # ----- add (and check) product dependencies
+ dep.Add(product,
-+ req=['ASTER_ROOT', 'ASTER_VERSION', 'TOOLS_DIR'],
++ req=['ASTER_ROOT', 'TOOLS_DIR'],
+ )
-+ #XXX should use HOME_HOMARD
++ cfg['HOME_HOMARD'] = osp.join(cfg['ASTER_ROOT'], 'public', pkg_name)
+
+ # ----- setup instance
+ setup=SETUP(
@@ -9255,73 +9356,64 @@
+ actions=(
+ ('Extract' , {}),
+ ('Install' , { 'command' :
-+ 'echo "%(cfgtxt)s\n" | python setup_homard.py' % \
-+ { 'cfgtxt' : os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'config.txt'), }
++ 'python setup_homard.py --prefix=%s' % cfg['HOME_HOMARD']
+ }),
-+ ('Install' , { 'command' : 'cd '+cfg['TOOLS_DIR']+' ; rm -f homard ; ln -sf '+\
-+ os.path.join('.', 'HOMARD', 'ASTER_HOMARD', 'homard')+' .' }),
-+ ('ChgFiles' , {
-+ 'files' : [os.path.join('HOMARD', 'ASTER_HOMARD', 'homard')],
-+ 'path' : '__setup.installdir__',
-+ 'postinst' : kargs['postinst'],
-+ 'only_post' : True,
++ ('Install' , {
++ 'path' : cfg['TOOLS_DIR'],
++ 'command' : 'rm -f homard ; ln -sf ../public/%s/homard .' % pkg_name,
+ }),
+ ('Clean' , {}),
+ ),
+
-+ installdir = cfg['TOOLS_DIR'],
++ installdir = cfg['HOME_HOMARD'],
+ sourcedir = cfg['SOURCEDIR'],
+ )
+ return setup
+
++
++
Index: aster-11.0.10-1/products_versions.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ 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',
-+ 'aster-src': '10.3.0',
-+ 'astk': '1.8.4',
-+ 'eficas': '2.1.1',
-+ 'eficas-doc': '2.1.1',
++++ aster-11.0.10-1/products_versions.py 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,33 @@
++
++dict_prod = {'aster': '11.0.10',
++ 'aster-src': '11.0.10',
++ 'astk': '1.10.0',
++ 'eficas': '6.3.0',
++ 'eficas-doc': '6.3.0',
+ 'gibi': '2000',
-+ 'gmsh': '2.4.2',
++ 'gmsh': '2.5.0',
+ 'grace': '5.1.21',
-+ 'hdf5': '1.6.9',
-+ 'homard': '9.8',
-+ 'med': '2.3.6',
-+ 'metis': '4.0',
-+ 'metis-edf': '4.1',
++ 'hdf5': '1.8.4',
++ 'homard': '10.1',
++ 'med': '3.0.3',
++ 'metis': '4.0.3',
++ 'metis-edf': '4.0.3',
+ 'mumps': '4.9.2',
-+ 'omniORB': '4.1.4',
-+ 'omniORBpy': '3.4',
-+ 'pylotage': '2.0.5',
-+ 'scotch': '4.0'}
++ 'scotch': '5.1.11_esmumps'}
+
+dict_prod_param = {'__to_install__': ['med',
+ 'astk',
-+ 'omniORB',
-+ 'grace',
++ 'gmsh',
+ 'hdf5',
-+ 'metis-edf',
+ 'homard',
+ 'metis',
+ 'aster',
+ 'gibi',
-+ 'omniORBpy',
-+ 'pylotage',
++ 'metis-edf',
+ 'mumps',
+ 'aster',
+ 'eficas',
+ 'scotch',
-+ 'gmsh',
++ 'grace',
+ 'eficas-doc']}
+
Index: aster-11.0.10-1/setup.cfg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/setup.cfg 2011-02-15 10:09:18.000000000 +0100
++++ aster-11.0.10-1/setup.cfg 2011-12-16 16:19:30.000000000 +0100
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -9357,17 +9449,24 @@
+# GNU compiler for all products
+PREFER_COMPILER = 'GNU'
+
-+# If you have Intel compilers you should uncomment following lines:
++# If you have another compilers you should uncomment following lines:
+# (aster, mumps, metis, metis-edf)
+# Note the "-" replaced by "_"
+#PREFER_COMPILER_aster = 'Intel'
++# or
++#PREFER_COMPILER_aster = 'Open64'
++# or
++#PREFER_COMPILER_aster = 'Pathscale'
++
+#PREFER_COMPILER_mumps = PREFER_COMPILER_aster
+#PREFER_COMPILER_metis = PREFER_COMPILER_aster
+#PREFER_COMPILER_metis_edf = PREFER_COMPILER_aster
+
+
-+# There are also two variants Intel_without_MATH, GNU_without_MATH but if you choose
-+# one of these you MUST set your mathematical libraries argument using MATHLIB.
++# There are also variants :
++# Intel_without_MATH, GNU_without_MATH, Open64_without_MATH, Pathscale_without_MATH
++# but if you choose one of these you MUST set your mathematical libraries
++# argument using MATHLIB.
+# Example : PREFER_COMPILER='Intel_without_MATH'
+# and MATHLIB = '-L/path_to_acml_libs -lacml'
+
@@ -9390,6 +9489,7 @@
+#-------------------------------------------------------------------------------
+# C and Fortran compilers and linker for Code_Aster
+# classical values for GNU compilers
++# A value defined here will be used for all compilers.
+#CC='/usr/bin/gcc'
+#CXX='/usr/bin/g++'
+#F77='/usr/bin/g77'
@@ -9399,7 +9499,7 @@
+
+#USE_FPIC=False # default is True
+
-+# Example for Intel compilers (see README file)
++# Example for Intel compilers (see the README file)
+#CC='/opt/intel/cc/9.1.049/bin/icc'
+#CXX='/opt/intel/cc/9.1.049/bin/icpc'
+#F77='/opt/intel/fc/9.1.045/bin/ifort'
@@ -9467,19 +9567,11 @@
+# ZMAT libraries (commercial, available at http://www.mat.ensmp.fr/)
+#HOME_ZMAT='' # which contains PUBLIC/lib-Linux4/libZmat_base.so and others
+
-+#-------------------------------------------------------------------------------
-+# Interface between Code_Aster and Salome
-+_install_omniORB = True
-+_install_omniORBpy = True
-+_install_pylotage = True
-+# Salome version supported by pylotage
-+SALOME_VERSION = 'DEFAULT' # DEFAULT means the last one supported by pylotage
-+
Index: aster-11.0.10-1/setup.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/setup.py 2011-02-15 10:09:18.000000000 +0100
-@@ -0,0 +1,925 @@
++++ aster-11.0.10-1/setup.py 2011-12-16 16:19:30.000000000 +0100
+@@ -0,0 +1,907 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# ==============================================================================
@@ -9504,8 +9596,8 @@
+
+import sys
+# ----- check for Python version
-+if sys.hexversion < 0x020400F0:
-+ print _('This script requires Python 2.4 or higher, sorry !')
++if sys.hexversion < 0x020600F0:
++ print _('This script requires Python 2.6 or higher, sorry !')
+ sys.exit(4)
+
+import os
@@ -9570,8 +9662,8 @@
+ 'aster',
+ 'homard']
+ to_install = [prod for prod in to_install_ordered if prod in available_products]
-+
-+ __aster_version__ = 'STA%s' % short_version
++
++ __aster_version__ = 'NEW%s' % short_version #XXX TO REPLACE BY STA !
+
+ # 0.2. ----- version
+ import __pkginfo__
@@ -9594,7 +9686,7 @@
+
+ By default all products are installed, but you can install only one (if a
+ first attempt failed). Example : python setup.py install aster.
-+
++
+ Available products (the order is important) :
+ %(prod)s.""") % {
+ 'vers' : python_version,
@@ -9608,7 +9700,7 @@
+ _fmt_search=_('Checking for %s... ')
+
+ log._print(_separ, svers, _separ)
-+
++
+ scmd = """Command line :
+ %s""" % ' '.join([sys.executable] + sys.argv)
+ log._print(_separ, scmd, _separ)
@@ -9652,7 +9744,7 @@
+
+ main_script=sys.argv[0]
+ setup_maindir = os.path.normpath(os.path.dirname(os.path.abspath(main_script)))
-+
++
+ default_cfgfile = os.path.join(setup_maindir, 'setup.cfg')
+ cache_file = os.path.join(setup_maindir, 'setup.cache')
+
@@ -9764,9 +9856,10 @@
+ cfg[o]=def_opts[o]
+ # if all options are not directories write a different loop
+ cfg[o]=os.path.abspath(os.path.expanduser(cfg[o]))
-+
++
+ # 1.2. ----- start a wizard
+ # ... perhaps one day !
++ os.environ['ASTER_ROOT'] = cfg['ASTER_ROOT']
+
+ # 1.3.1. ----- configure standard directories
+ # {bin,lib,inc}dirs are used to search files
@@ -9794,7 +9887,7 @@
+ sysname, nodename, release, version, machine = os.uname()
+ log._print('Architecture : os.uname = %s' % str(os.uname()), DBG=True)
+ log._print('Architecture : sys.platform = %s os.name = %s' % (sys.platform, os.name), DBG=True)
-+
++
+ sident = ' '.join(os.uname())
+ if os.path.isfile('/etc/issue'):
+ sident = re.sub(r'\\.', '', open('/etc/issue', 'r').read()) + sident
@@ -9838,7 +9931,7 @@
+ bindirs = cfg.get('BINDIR', []) + bindirs
+ libdirs = cfg.get('LIBDIR', []) + libdirs
+ incdirs = cfg.get('INCLUDEDIR', []) + incdirs
-+
++
+ # 1.3.3. ----- variables with predefined value
+ cfg['ASTER_VERSION'] =cfg.get('ASTER_VERSION', __aster_version__)
+
@@ -9856,7 +9949,7 @@
+ # python modules location
+ cfg['PYTHONPATH'] = cfg.get('PYTHONPATH', '')
+ cfg['OPT_ENV'] = cfg.get('OPT_ENV', '')
-+
++
+ #-------------------------------------------------------------------------------
+ # 1.4. ----- auto-configuration
+ #-------------------------------------------------------------------------------
@@ -10012,25 +10105,25 @@
+ list_lib.append(cfg['__tmp__'])
+ cfg['SYSLIB'] += ' ' + ' '.join(list_lib)
+ cfg['SYSLIB'] = cfg['SYSLIB'].strip()
-+
++
+ # 1.4.2. ----- check for compilers
+ cfg_ini = cfg.copy()
+ dict_pref = dict([(k.replace('PREFER_COMPILER_', ''), v) \
+ for k, v in cfg.items() if k.startswith('PREFER_COMPILER')])
+ if not dict_pref.get('PREFER_COMPILER'):
+ dict_pref['PREFER_COMPILER'] = 'GNU'
-+
++
+ from check_compilers import COMPILER_MANAGER
+ compiler_manager = COMPILER_MANAGER(debug, print_func=log._print)
+ lkeys = dict_pref.keys()
+ lkeys.sort()
+ log._print('PREFER_COMPILER keys : %s' % lkeys, DBG=True)
-+
++
+ # general compiler options
+ compiler_option = []
+ if cfg.get('USE_FPIC', True):
+ compiler_option.append('-fPIC')
-+
++
+ for prod in lkeys:
+ prefcompiler = dict_pref[prod]
+ log._print(_separ, term='')
@@ -10065,10 +10158,10 @@
+ if debug:
+ from pprint import pprint
+ pprint(compiler_manager.get_config(prod))
-+
++
+ # activate main compiler
+ compiler_manager.switch_in_dep(dep, product='__main__', system=system, verbose=False)
-+
++
+ # 1.4.3. ----- check for ps commands :
+ # PS_COMMAND_CPU returns (field 1) cputime and (field 2) command line
+ # PS_COMMAND_PID returns (field 1) pid and (field 2) command line
@@ -10088,9 +10181,9 @@
+
+ # 1.4.4. ----- check for a terminal
+ ListTerm=[
-+ ['xterm' , 'xterm -display @D -e @E',],
-+ ['gnome-terminal' , 'gnome-terminal --display=@D --command=@E',],
-+ ['konsole', 'konsole --display @D -e @E'],]
++ ['xterm' , 'xterm -e @E',],
++ ['gnome-terminal' , 'gnome-terminal --command=@E',],
++ ['konsole', 'konsole -e @E'],]
+ for prg, cmd in ListTerm:
+ term = ftools.find_file(prg, typ='bin')
+ if term != None:
@@ -10104,11 +10197,11 @@
+ # and modify command line of those which don't have a --display= option
+ ListEdit=[
+ ['nedit' , 'nedit',],
-+ ['gedit' , 'gedit --display=@D',],
-+ ['kwrite', 'kwrite --display @D',],
-+ ['xemacs', 'xemacs -display @D',],
-+ ['emacs' , 'emacs -display @D',],
-+ ['xedit' , 'xedit -display @D',],
++ ['gedit' , 'gedit',],
++ ['kwrite', 'kwrite',],
++ ['xemacs', 'xemacs',],
++ ['emacs' , 'emacs',],
++ ['xedit' , 'xedit',],
+ ['vi' , cfg.get('TERMINAL', 'xterm')+' -e vi',],]
+ for prg, cmd in ListEdit:
+ edit = ftools.find_file(prg, typ='bin')
@@ -10137,13 +10230,13 @@
+ if debugger_command != None:
+ cfg['DEBUGGER_COMMAND_POST'] = debugger_command_format % debugger_command
+ break
-+
++
+ if debugger_command != None:
+ ddd = ftools.find_file('ddd', typ='bin')
+ if ddd != None:
+ cfg['DEBUGGER_COMMAND'] = '%s --%s --debugger %s --command=@D @E @C' \
+ % (ddd, debugger, debugger_command)
-+
++
+ # 1.4.7. ----- check for utilities (for scotch)
+ ftools.find_and_set(cfg, 'FLEX', 'flex', err=False)
+ ftools.find_and_set(cfg, 'RANLIB', 'ranlib', err=False)
@@ -10178,7 +10271,7 @@
+ log._print(cfg['SERVER_NAME'])
+ log._print(_fmt_search % _('network domain name'), domain)
+ log._print(_fmt_search % _('full qualified network name'), cfg['FULL_SERVER_NAME'])
-+
++
+ #-------------------------------------------------------------------------------
+ # 1.6. ----- optionnal tools/libs
+ #-------------------------------------------------------------------------------
@@ -10197,7 +10290,7 @@
+ cfg['HOME_SCOTCH'] = cfg.get('HOME_SCOTCH', '')
+ # MPI for FETI
+ cfg['HOME_MPI'] = cfg.get('HOME_MPI', '')
-+
++
+ # 1.6.3. ----- Numeric
+ if not cfg['USE_NUMPY']:
+ if not opts.force and ftools.pymod_exists('Numeric') and 'Numeric' in to_install:
@@ -10209,12 +10302,11 @@
+ if numeric_inc != None:
+ to_install.remove('Numeric')
+ ftools.CheckFromLastFound(cfg, 'HOME_NUMPY', 'include')
-+
++
+ # 1.6.4. ----- mumps
-+ cfg['INCLUDE_MUMPS'] = cfg.get('INCLUDE_MUMPS', '')
-+ if 'mumps' in to_install:
-+ cfg['INCLUDE_MUMPS'] = 'include_mumps-%s' % dict_prod['mumps']
-+
++ cfg['INCLUDE_MUMPS'] = cfg.get('INCLUDE_MUMPS',
++ 'include_mumps-%s' % dict_prod['mumps'])
++
+ # 1.6.5. ----- grace 5
+ grace_add_symlink = False
+ if not opts.force and 'grace' in to_install:
@@ -10258,6 +10350,7 @@
+ if not os.path.exists(cfg['ASTER_ROOT']):
+ try:
+ os.makedirs(cfg['ASTER_ROOT'])
++ os.makedirs(osp.join(cfg['ASTER_ROOT'], 'bin'))
+ except OSError:
+ err = True
+ err = err or not os.access(cfg['ASTER_ROOT'], os.W_OK)
@@ -10298,24 +10391,6 @@
+ should_continue()
+
+ t_ini = time.time() - t_ini
-+
-+ #-------------------------------------------------------------------------------
-+ # 3. prepare post-installation
-+ #-------------------------------------------------------------------------------
-+ post_installdir = os.path.join(cfg['ASTER_ROOT'], '.postinst')
-+ if not os.path.exists(post_installdir):
-+ os.makedirs(post_installdir)
-+ shutil.copy2(os.path.join(setup_maindir, 'post_install.py'), post_installdir)
-+ os.chmod(os.path.join(post_installdir, 'post_install.py'), 0755)
-+ # save main parameters
-+ open(os.path.join(post_installdir, 'variables'), 'w').write("""
-+ASTER_ROOT = '%s'
-+PYTHON_EXE = '%s'
-+PYTHON_LIB = '%s'
-+""" % (cfg['ASTER_ROOT'],
-+ cfg['PYTHON_EXE'],
-+ pylib))
-+ shutil.copy2(os.path.join(post_installdir, 'variables'), 'variables.init')
+
+ #-------------------------------------------------------------------------------
+ # 4. products installation
@@ -10362,7 +10437,6 @@
+ 'system' : system,
+ 'find_tools' : ftools,
+ 'log' : log,
-+ 'postinst' : post_installdir,
+ })
+ else:
+ raise SetupError(_('Setup script for %s not available.') % product)
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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Fri Dec 16 15:48:28 2011
@@ -1,7 +1,7 @@
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
+--- aster-11.0.10-1.orig/NEW11.0/bibf90/echange/mfchac.F 2011-12-16 16:19:27.000000000 +0100
++++ aster-11.0.10-1/NEW11.0/bibf90/echange/mfchac.F 2011-12-16 16:20:22.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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.diff Fri Dec 16 15:48:28 2011
@@ -1,8 +1,8 @@
Index: aster-11.0.10-1/products.py
===================================================================
---- 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 @@
+--- aster-11.0.10-1.orig/products.py 2011-12-16 16:18:51.000000000 +0100
++++ aster-11.0.10-1/products.py 2011-12-16 16:19:01.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'):
zmat_platform='Linux'
@@ -16,7 +16,7 @@
opt['CFLAGS_DBG'] = '-g -I/usr/include/mpi -DH5PART_HAS_MPI'
opt['CFLAGS'] = '-O2 -I/usr/include/mpi -DH5PART_HAS_MPI'
opt['FFLAGS_DBG'] = '-g '
-@@ -1027,7 +1027,10 @@
+@@ -1021,7 +1021,10 @@
mumps_lib = ['dmumps', 'zmumps']
if not less_than_version(dict_prod['mumps'], '4.8.0'):
mumps_lib.extend(['smumps', 'cmumps', 'mumps_common'])
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=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff Fri Dec 16 15:48:28 2011
@@ -1,8 +1,17 @@
Index: aster-11.0.10-1/setup.cfg
===================================================================
---- 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 @@
+--- aster-11.0.10-1.orig/setup.cfg 2011-12-16 16:19:30.000000000 +0100
++++ aster-11.0.10-1/setup.cfg 2011-12-16 16:20:10.000000000 +0100
+@@ -10,7 +10,7 @@
+
+ #-------------------------------------------------------------------------------
+ # Code_Aster toplevel directory (ex: /aster, /opt/aster...)
+-ASTER_ROOT='/opt/aster'
++ASTER_ROOT='/usr/lib/codeaster'
+
+ # astk configuration (for network capabilities)
+ # Let the setup configure it for you or define the 3 following parameters :
+@@ -111,29 +111,29 @@
#INCLUDEDIR=['/myprefix/include', ]
# To search for shared libraries first
@@ -39,7 +48,7 @@
#-------------------------------------------------------------------------------
# Optionnal packages
-@@ -138,15 +138,17 @@
+@@ -146,6 +146,8 @@
# (Fortran 90 compiler is required to use MUMPS with Code_Aster)
#_install_mumps = False
#HOME_MUMPS='' # which contains lib/libseq directory
@@ -48,15 +57,3 @@
# ZMAT libraries (commercial, available at http://www.mat.ensmp.fr/)
#HOME_ZMAT='' # which contains PUBLIC/lib-Linux4/libZmat_base.so and others
-
- #-------------------------------------------------------------------------------
- # Interface between Code_Aster and Salome
--_install_omniORB = True
--_install_omniORBpy = True
--_install_pylotage = True
-+_install_omniORB = False
-+_install_omniORBpy = False
-+_install_pylotage = False
- # Salome version supported by pylotage
- SALOME_VERSION = 'DEFAULT' # DEFAULT means the last one supported by pylotage
-
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=44188&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 Fri Dec 16 15:48:28 2011
@@ -1,7 +1,7 @@
Index: aster-11.0.10-1/NEW11.0/astest/liste_short_without_homard
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/NEW11.0/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-12-16 16:20:30.000000000 +0100
@@ -0,0 +1,24 @@
+forma02a
+forma02b
Modified: packages/code-aster/aster/trunk/debian/profile.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/profile.sh?rev=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/profile.sh (original)
+++ packages/code-aster/aster/trunk/debian/profile.sh Fri Dec 16 15:48:28 2011
@@ -1,27 +1,22 @@
-# profile for Code_Aster version 10.3
+# profile for Code_Aster version 11.10
if [ -z "$DEFINE_PROFILE_ASTER_VERSION" ]; then
export DEFINE_PROFILE_ASTER_VERSION=done
#--- ifndef DEFINE_PROFILE_ASTER_VERSION ---------------------------------------
-PATH=/usr/lib/gcc/x86_64-linux-gnu/4.4.5:\
-/bin:\
-/usr/bin:$ASTER_ROOT/outils:$PATH
-export PATH
+if [ -z "$ASTER_ROOT" ]; then
+ # from first installation
+ ASTER_ROOT=/usr/lib/codeaster
+ export ASTER_ROOT
-LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.4:\
-/usr:\
-/usr/lib/gcc/x86_64-linux-gnu/4.4.5:\
-/usr/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-
-PYTHONPATH=/usr/lib/pymodules/python$PYVER:$PYTHONPATH
-export PYTHONPATH
-
-#?OPT_ENV?
+ if [ -z "$PATH" ]; then
+ export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils
+ else
+ export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
+ fi
+fi
+#--- endif DEFINE_PROFILE_ASTER_VERSION ------------------------------------------------
+fi
-
-#--- endif DEFINE_PROFILE_ASTER_VERSION ----------------------------------------
-fi
Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=44188&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Fri Dec 16 15:48:28 2011
@@ -5,9 +5,11 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+XXBITS ?= $(shell getconf LONG_BIT)
+HOSTNAME ?= $(shell hostname)
-#PYVERS := $(shell pyversions -vr debian/control)
-PYVERS := 2.7
+PYVERS := $(shell pyversions -vr debian/control)
+
STA_VERSION=NEW11.0
PTA_VERSION=NEW11.0_mpi
@@ -51,6 +53,10 @@
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.44
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.46
+ # Add as_test.sh
+ mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest
+ cp debian/as_test.sh $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest
+
touch $@
@@ -75,15 +81,16 @@
set -ex; \
for v in $(PYVERS); do \
cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/profile_py$$v.sh; \
+ perl -pi -e "s|HOSTNAME|$(HOSTNAME)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/profile_py$$v.sh; \
- cp -f debian/config.txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+ cp -f debian/config_$(XXBITS).txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|DEB_DESTDIR|$(DEB_DESTDIR)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|ASTER_ROOT|$(ASTER_ROOT)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(STA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
find $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION) -name \*.o | xargs rm; \
perl -pi -e "s|$(DEB_DESTDIR)||g" $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
- rm -f $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config.txt; \
+ perl -pi -e "s|$(HOSTNAME)|HOSTNAME|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
done
mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/outils
@@ -95,8 +102,9 @@
set -ex; \
for v in $(PYVERS); do \
cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
+ perl -pi -e "s|HOSTNAME|$(HOSTNAME)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
- cp -f debian/config-mpi.txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ cp -f debian/config-mpi_$(XXBITS).txt $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|DEB_DESTDIR|$(DEB_DESTDIR)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|ASTER_ROOT|$(ASTER_ROOT)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
@@ -105,6 +113,7 @@
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
find $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION) -name \*.o | xargs rm; \
perl -pi -e "s|$(DEB_DESTDIR)||g" $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|$(HOSTNAME)|HOSTNAME|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
done
#
# 4. change mumps_scotch to mumps_ptscotch?
@@ -162,16 +171,13 @@
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/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
+ cd tmp && wget "http://www.code-aster.org/FICHIERS/aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz"
- # Go to SRC directory and retreive astk source
+ # Go to SRC directory and retreive aster source
cd tmp && tar xzf aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
cd tmp/aster-full-src-$(ASTER_VERSION)/SRC && tar zxvf $(DEB_SOURCE_PACKAGE)-src-$(DEB_UPSTREAM_VERSION).noarch.tar.gz
-
- # Retreive ASTER src only
mkdir -p tmp/aster-full-src-$(ASTER_VERSION)/SRC/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
cd tmp/aster-full-src-$(ASTER_VERSION)/SRC && mv $(STA_VERSION) $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
cd tmp/aster-full-src-$(ASTER_VERSION)/SRC && tar zcvf $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+
rm -rf tmp
More information about the debian-science-commits
mailing list