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

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Jan 13 10:21:21 UTC 2011 

Author: trophime-guest
Date: Thu Jan 13 10:21:20 2011
New Revision: 37209

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37209
Log:
update to 10.3 (thanks to Andre Espaze)

Modified:
    packages/code-aster/aster/trunk/debian/README.Debian
    packages/code-aster/aster/trunk/debian/changelog
    packages/code-aster/aster/trunk/debian/code-aster-dev.install
    packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install
    packages/code-aster/aster/trunk/debian/code-aster-engine.install
    packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
    packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
    packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
    packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
    packages/code-aster/aster/trunk/debian/code-aster-test.install
    packages/code-aster/aster/trunk/debian/config-mpi.txt
    packages/code-aster/aster/trunk/debian/config.txt
    packages/code-aster/aster/trunk/debian/control
    packages/code-aster/aster/trunk/debian/patches/mpi.patch
    packages/code-aster/aster/trunk/debian/patches/series
    packages/code-aster/aster/trunk/debian/profile.sh
    packages/code-aster/aster/trunk/debian/rules

Modified: packages/code-aster/aster/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/README.Debian?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/README.Debian (original)
+++ packages/code-aster/aster/trunk/debian/README.Debian Thu Jan 13 10:21:20 2011
@@ -7,7 +7,7 @@
 
 ln -s config-py2.5.txt config.txt
  
-To add the MPI version, append STA10.2_mpi to the lists of versions 
+To add the MPI version, append STA10.3_mpi to the lists of versions 
 in /etc/codeaster/aster :
 
-vers : STA10.2, STA10.2_mpi
+vers : STA10.3, STA10.3_mpi

Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Thu Jan 13 10:21:20 2011
@@ -1,3 +1,23 @@
+aster (10.3.0-1-1.1) unstable; urgency=low
+
+  [Andre Espaze]
+  * New upstream version
+  * debian/rules:
+     + replacements to astout.export for running tests
+  * debian/config.txt:
+     * Build with sequential version of MUMPS
+     * Build with metis-edf instead of metis
+     + Adding _USE_MED_SHORT_INT flag for using med with short int
+  * debian/config-mpi.txt:
+     * Build with metis-edf instead of metis
+     + Adding _USE_MED_SHORT_INT flag for using med with short int
+  * debian/series: adding tests_without_homard.patch
+  * debian/patches/tests_without_homard.patch: tests without homard
+  * debian/patches/mpi.patch: update to 10.3 version
+  * *.install, *.postinst, *.postrm: update to 10.3 version
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Tue, 11 Jan 2011 15:43:53 +0100
+
 aster (10.2.0-1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -12,7 +32,7 @@
      * Replace python-numeric by python-numpy
   * debian/rules : complete rewrite
 
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Thu, 26 Aug 2010 14:10:47 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Thu, 30 Sep 2010 11:10:47 +0200
 
 aster (9.2.0-3) unstable; urgency=low
 

Modified: packages/code-aster/aster/trunk/debian/code-aster-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-dev.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-dev.install Thu Jan 13 10:21:20 2011
@@ -1,10 +1,10 @@
-usr/lib/codeaster/STA10.2/python*/lib/libaster.a
-usr/lib/codeaster/STA10.2/python*/lib/libferm.a
-usr/lib/codeaster/STA10.2/bibf90
-usr/lib/codeaster/STA10.2/bibc
-usr/lib/codeaster/STA10.2/bibfor
-usr/lib/codeaster/STA10.2/fermetur
-usr/lib/codeaster/STA10.2/catapy
-usr/lib/codeaster/STA10.2/catalo
-usr/lib/codeaster/STA10.2/Makefile*
-usr/lib/codeaster/STA10.2/python*/obj
+usr/lib/codeaster/STA10.3/python*/lib/libaster.a
+usr/lib/codeaster/STA10.3/python*/lib/libferm.a
+usr/lib/codeaster/STA10.3/bibf90
+usr/lib/codeaster/STA10.3/bibc
+usr/lib/codeaster/STA10.3/bibfor
+usr/lib/codeaster/STA10.3/fermetur
+usr/lib/codeaster/STA10.3/catapy
+usr/lib/codeaster/STA10.3/catalo
+usr/lib/codeaster/STA10.3/Makefile*
+usr/lib/codeaster/STA10.3/python*/obj

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install Thu Jan 13 10:21:20 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/STA10.2/asterd_py*
-usr/lib/codeaster/STA10.2/python*/lib/libasterd.a
-usr/lib/codeaster/STA10.2/python*/lib/libfermd.a
+usr/lib/codeaster/STA10.3/asterd_py*
+usr/lib/codeaster/STA10.3/python*/lib/libasterd.a
+usr/lib/codeaster/STA10.3/python*/lib/libfermd.a

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.install Thu Jan 13 10:21:20 2011
@@ -1,12 +1,12 @@
-usr/lib/codeaster/STA10.2/asteru_py*
-usr/lib/codeaster/STA10.2/dtag
-usr/lib/codeaster/STA10.2/materiau
-usr/lib/codeaster/STA10.2/bibpyt
-usr/lib/codeaster/STA10.2/python*/commande
-usr/lib/codeaster/STA10.2/python*/cata_ele.pickled
-usr/lib/codeaster/STA10.2/python*/elements
-usr/lib/codeaster/STA10.2/config-py*.txt
-usr/lib/codeaster/STA10.2/profile_py*.sh
-usr/lib/codeaster/STA10.2/forma01a.export
+usr/lib/codeaster/STA10.3/asteru_py*
+usr/lib/codeaster/STA10.3/dtag
+usr/lib/codeaster/STA10.3/materiau
+usr/lib/codeaster/STA10.3/bibpyt
+usr/lib/codeaster/STA10.3/python*/commande
+usr/lib/codeaster/STA10.3/python*/cata_ele.pickled
+usr/lib/codeaster/STA10.3/python*/elements
+usr/lib/codeaster/STA10.3/config-py*.txt
+usr/lib/codeaster/STA10.3/profile_py*.sh
+usr/lib/codeaster/STA10.3/forma01a.export
 usr/lib/codeaster/outils/onmetis*
-usr/lib/codeaster/STA10.2/forma01a.export
+usr/lib/codeaster/STA10.3/forma01a.export

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postinst?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Thu Jan 13 10:21:20 2011
@@ -6,8 +6,8 @@
 dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.2/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/STA10.2/config-py$v.txt /usr/lib/codeaster/STA10.2/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.3/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.3/config-py$v.txt /usr/lib/codeaster/STA10.3/config.txt; \
 done	
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-engine.postrm?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Thu Jan 13 10:21:20 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.2/config.txt
+    rm -f /usr/lib/codeaster/STA10.3/config.txt
 fi
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install Thu Jan 13 10:21:20 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/STA10.2_mpi/asterd_py*
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/STA10.3_mpi/asterd_py*
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libfermd*.a

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install Thu Jan 13 10:21:20 2011
@@ -1,12 +1,12 @@
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libaster*.a
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libferm*.a
-usr/lib/codeaster/STA10.2_mpi/python*/lib/libfermd*.a
-usr/lib/codeaster/STA10.2_mpi/bibf90
-usr/lib/codeaster/STA10.2_mpi/bibc
-usr/lib/codeaster/STA10.2_mpi/bibfor
-usr/lib/codeaster/STA10.2_mpi/fermetur
-usr/lib/codeaster/STA10.2_mpi/catapy
-usr/lib/codeaster/STA10.2_mpi/catalo
-usr/lib/codeaster/STA10.2_mpi/Makefile*
-usr/lib/codeaster/STA10.2_mpi/python*/obj
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libaster*.a
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libferm*.a
+usr/lib/codeaster/STA10.3_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/STA10.3_mpi/bibf90
+usr/lib/codeaster/STA10.3_mpi/bibc
+usr/lib/codeaster/STA10.3_mpi/bibfor
+usr/lib/codeaster/STA10.3_mpi/fermetur
+usr/lib/codeaster/STA10.3_mpi/catapy
+usr/lib/codeaster/STA10.3_mpi/catalo
+usr/lib/codeaster/STA10.3_mpi/Makefile*
+usr/lib/codeaster/STA10.3_mpi/python*/obj

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

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst Thu Jan 13 10:21:20 2011
@@ -6,8 +6,8 @@
 dc_pyvers="$(pyversions -s  | perl -pi -e 's|python||g')"
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.2_mpi/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/STA10.2_mpi/config-py$v.txt /usr/lib/codeaster/STA10.2_mpi/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.3_mpi/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.3_mpi/config-py$v.txt /usr/lib/codeaster/STA10.3_mpi/config.txt; \
 done	
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm Thu Jan 13 10:21:20 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.2_mpi/config.txt
+    rm -f /usr/lib/codeaster/STA10.3_mpi/config.txt
 fi
 	
 #DEBHELPER#

Modified: packages/code-aster/aster/trunk/debian/code-aster-test.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-test.install?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Thu Jan 13 10:21:20 2011
@@ -1,2 +1,2 @@
-usr/lib/codeaster/STA10.2/astest/*
-usr/lib/codeaster/STA10.2/astout.export
+usr/lib/codeaster/STA10.3/astest/*
+usr/lib/codeaster/STA10.3/astout.export

Modified: packages/code-aster/aster/trunk/debian/config-mpi.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi.txt?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi.txt Thu Jan 13 10:21:20 2011
@@ -51,7 +51,7 @@
 BIBL           | c++     | ?     | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
 #
-DEFS           | defined | ?     | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI
+DEFS           | defined | ?     | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI _USE_MED_SHORT_INT
 #
 NOBUILD        | option  | ?     |  
 #
@@ -63,7 +63,7 @@
 CC             | cc      | ?     | /usr/bin/mpicc
 OPTC_D         | cc      | ?     | -c -g  -fno-stack-protector -fPIC
 OPTC_O         | cc      | ?     | -c -O2 -fno-stack-protector -fPIC
-INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.2_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/include/scotch
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.3_mpi/bibc/include -I/usr/include/pythonPYVER -I/usr/include/scotch
 #
 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
@@ -73,7 +73,7 @@
 F90            | f90     | ?     | /usr/bin/mpif90
 OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 OPTF90_O       | f90     | ?     | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.2/bibf90/include_mumps-4.9.2
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibf90/include_mumps-4.9.2
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.2_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.2_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.3_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.3_mpi/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/config.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config.txt?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config.txt (original)
+++ packages/code-aster/aster/trunk/debian/config.txt Thu Jan 13 10:21:20 2011
@@ -43,14 +43,14 @@
 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 -L/usr/lib -lzmumps -L/usr/lib -lsmumps -L/usr/lib -lcmumps -L/usr/lib -lmumps_common -L/usr/lib -lpord -L/usr/lib -lmpiseq_seq -L/usr/lib -lmetis
+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 -lmetis-edf
 BIBL           | scotch  | 4.0   | -L/usr/lib -lscotch -L/usr/lib -lscotcherr -L/usr/lib -lscotcherrexit
 BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lgfortran
 BIBL           | mpi     | 2     | 
 BIBL           | c++     | ?     | -L/usr/lib/gcc/x86_64-linux-gnu/4.4 -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
 #
-DEFS           | defined | ?     | LINUX64 _HAVE_MUMPS H5_USE_16_API H5PART_HAS_MPI
+DEFS           | defined | ?     | LINUX64 _HAVE_MUMPS H5_USE_16_API H5PART_HAS_MPI _USE_MED_SHORT_INT
 #
 NOBUILD        | option  | ?     |  bibfor/from_c
 #
@@ -62,7 +62,7 @@
 CC             | cc      | ?     | /usr/bin/gcc
 OPTC_D         | cc      | ?     | -c -I/usr/include/mpi
 OPTC_O         | cc      | ?     | -c -I/usr/include/mpi
-INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.2/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch
 #
 F77            | f77     | ?     | /usr/bin/gfortran
 OPTF_D         | f77     | ?     | -c -g  -fopenmp -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
@@ -72,7 +72,7 @@
 F90            | f90     | ?     | /usr/bin/gfortran
 OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 OPTF90_O       | f90     | ?     | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.2/bibf90/include_mumps-4.9.2
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.3/bibf90/include_mumps-4.9.2
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -110,8 +110,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.2/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.2/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.3/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.3/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Thu Jan 13 10:21:20 2011
@@ -8,7 +8,7 @@
  liblapack-dev, libblas-dev, libhdf5-mpi-dev, libmed-dev,
  python-all-dev (>= 2.5), 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,
- libptscotch-dev, libscalapack-mpi-dev, libblacs-mpi-dev, mpi-default-dev, metis-edf
+ libscotchmetis-dev, libptscotch-dev, libscalapack-mpi-dev, libblacs-mpi-dev, mpi-default-dev, metis-edf
 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/mpi.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/mpi.patch?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.patch Thu Jan 13 10:21:20 2011
@@ -1,7 +1,7 @@
-Index: aster-10.2.0-1/STA10.2/config.txt
+Index: aster-10.3.0-1/STA10.3/config.txt
 ===================================================================
---- aster-10.2.0-1.orig/STA10.2/config.txt	2010-08-25 10:58:29.000000000 +0200
-+++ aster-10.2.0-1/STA10.2/config.txt	2010-08-25 10:59:01.000000000 +0200
+--- aster-10.3.0-1.orig/STA10.3/config.txt	2010-08-25 10:58:29.000000000 +0200
++++ aster-10.3.0-1/STA10.3/config.txt	2010-08-25 10:59:01.000000000 +0200
 @@ -33,102 +33,103 @@
  #  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)

Modified: packages/code-aster/aster/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/series?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/series (original)
+++ packages/code-aster/aster/trunk/debian/patches/series Thu Jan 13 10:21:20 2011
@@ -2,3 +2,4 @@
 setup.cfg.patch
 debian-install.patch
 mpi.patch
+tests_without_homard.patch

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=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/profile.sh (original)
+++ packages/code-aster/aster/trunk/debian/profile.sh Thu Jan 13 10:21:20 2011
@@ -1,4 +1,4 @@
-# profile for Code_Aster version 10.2
+# profile for Code_Aster version 10.3
 
 if [ -z "$DEFINE_PROFILE_ASTER_VERSION" ]; then
    export DEFINE_PROFILE_ASTER_VERSION=done

Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=37209&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Thu Jan 13 10:21:20 2011
@@ -11,7 +11,7 @@
 STA_VERSION=STA10.2
 PTA_VERSION=STA10.2_mpi
 ASTER_VERSION=10.2.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-1
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
 
 ASTER_ROOT=$(shell echo `grep "export ASTER_ROOT=" /etc/codeaster/profile.sh | sed 's/export ASTER_ROOT=//'`)
 export ASTER_ROOT
@@ -25,6 +25,15 @@
 	cp -r $(STA_VERSION) $(DEB_DESTDIR)/$(ASTER_ROOT)
 	#mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag
 	#cp -r $(STA_VERSION)/* $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)
+	# Export file replacements for running tests 
+	sed -i "s:?ASTER_ROOT?:$(ASTER_ROOT):" $(ASTOUT_EXPORT)
+	sed -i "s:?ASTER_VERSION?:$(STA_VERSION):" $(ASTOUT_EXPORT)
+	# Use the short test list without homard by default
+	sed -i "/liste_internet/ s/^/#/" $(ASTOUT_EXPORT)
+	sed -i "s:#\(.*liste_short.*\):#\1\n\1:" $(ASTOUT_EXPORT)
+	sed -i "/^F/ s:liste_short:&_without_homard:" $(ASTOUT_EXPORT)
+	# Results will be in /tmp for writing permission
+	sed -i "/resu_test/ s:$(ASTER_ROOT)/$(STA_VERSION):/tmp:" $(ASTOUT_EXPORT)
 
 	# Remove extra license file
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/LICENSE.TERMS
@@ -145,7 +154,8 @@
 get-orig-source:
 	# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	mkdir -p tmp
-	cd tmp && wget "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=785"
+	wget -Ptmp "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=828" 
+	cd tmp && mv "spip.php?action=dw2_out&id=828" aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	
 	# Go to SRC directory and retreive astk source
 	cd tmp && tar xzf aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
@@ -156,4 +166,3 @@
 	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