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

apalazzi-guest at users.alioth.debian.org apalazzi-guest at users.alioth.debian.org
Mon Dec 26 23:10:33 UTC 2011 

Author: apalazzi-guest
Date: Mon Dec 26 23:10:33 2011
New Revision: 44255

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44255
Log:
Updated to build STA10.6 and fixed some lintian warnings.


Modified:
    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-mpi_64.txt
    packages/code-aster/aster/trunk/debian/config.txt
    packages/code-aster/aster/trunk/debian/config_64.txt
    packages/code-aster/aster/trunk/debian/control
    packages/code-aster/aster/trunk/debian/patches/debian-install.diff
    packages/code-aster/aster/trunk/debian/patches/edf-install.patch
    packages/code-aster/aster/trunk/debian/patches/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/rules

Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Mon Dec 26 23:10:33 2011
@@ -1,4 +1,4 @@
-aster (11.0.10-1-1) unstable; urgency=low
+aster (10.6.0-1-1) unstable; urgency=low
 
   * Initial import (Closes: #458812)
     Based on the work of Andre Espaze, Christophe Trophime, Adam C. Powell, IV

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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-dev.install Mon Dec 26 23:10:33 2011
@@ -1,10 +1,10 @@
-usr/lib/codeaster/NEW11.0/python*/lib/libaster.a
-usr/lib/codeaster/NEW11.0/python*/lib/libferm.a
-usr/lib/codeaster/NEW11.0/bibf90
-usr/lib/codeaster/NEW11.0/bibc
-usr/lib/codeaster/NEW11.0/bibfor
-usr/lib/codeaster/NEW11.0/fermetur
-usr/lib/codeaster/NEW11.0/catapy
-usr/lib/codeaster/NEW11.0/catalo
-usr/lib/codeaster/NEW11.0/Makefile*
-usr/lib/codeaster/NEW11.0/python*/obj
+usr/lib/codeaster/STA10.6/python*/lib/libaster.a
+usr/lib/codeaster/STA10.6/python*/lib/libferm.a
+usr/lib/codeaster/STA10.6/bibf90
+usr/lib/codeaster/STA10.6/bibc
+usr/lib/codeaster/STA10.6/bibfor
+usr/lib/codeaster/STA10.6/fermetur
+usr/lib/codeaster/STA10.6/catapy
+usr/lib/codeaster/STA10.6/catalo
+usr/lib/codeaster/STA10.6/Makefile*
+usr/lib/codeaster/STA10.6/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=44255&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 Mon Dec 26 23:10:33 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/NEW11.0/asterd_py*
-usr/lib/codeaster/NEW11.0/python*/lib/libasterd.a
-usr/lib/codeaster/NEW11.0/python*/lib/libfermd.a
+usr/lib/codeaster/STA10.6/asterd_py*
+usr/lib/codeaster/STA10.6/python*/lib/libasterd.a
+usr/lib/codeaster/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.install Mon Dec 26 23:10:33 2011
@@ -1,12 +1,11 @@
-usr/lib/codeaster/NEW11.0/asteru_py*
-usr/lib/codeaster/NEW11.0/dtag
-usr/lib/codeaster/NEW11.0/materiau
-usr/lib/codeaster/NEW11.0/bibpyt
-usr/lib/codeaster/NEW11.0/python*/commande
-usr/lib/codeaster/NEW11.0/python*/cata_ele.pickled
-usr/lib/codeaster/NEW11.0/python*/elements
-usr/lib/codeaster/NEW11.0/config-py*.txt
-usr/lib/codeaster/NEW11.0/profile_py*.sh
-usr/lib/codeaster/NEW11.0/forma01a.export
+usr/lib/codeaster/STA10.6/asteru_py*
+usr/lib/codeaster/STA10.6/materiau
+usr/lib/codeaster/STA10.6/bibpyt
+usr/lib/codeaster/STA10.6/python*/commande
+usr/lib/codeaster/STA10.6/python*/cata_ele.pickled
+usr/lib/codeaster/STA10.6/python*/elements
+usr/lib/codeaster/STA10.6/config-py*.txt
+usr/lib/codeaster/STA10.6/profile_py*.sh
+usr/lib/codeaster/STA10.6/forma01a.export
 usr/lib/codeaster/outils/onmetis*
-usr/lib/codeaster/NEW11.0/forma01a.export
+usr/lib/codeaster/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Mon Dec 26 23:10:33 2011
@@ -7,8 +7,8 @@
 dc_pyvers=2.7
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/NEW11.0/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/NEW11.0/config-py$v.txt /usr/lib/codeaster/NEW11.0/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.6/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.6/config-py$v.txt /usr/lib/codeaster/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Mon Dec 26 23:10:33 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/NEW11.0/config.txt
+    rm -f /usr/lib/codeaster/STA10.6/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=44255&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 Mon Dec 26 23:10:33 2011
@@ -1,3 +1,3 @@
-usr/lib/codeaster/NEW11.0_mpi/asterd_py*
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/STA10.6_mpi/asterd_py*
+usr/lib/codeaster/STA10.6_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.6_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=44255&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 Mon Dec 26 23:10:33 2011
@@ -1,12 +1,12 @@
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libaster*.a
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libasterd*.a
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libferm*.a
-usr/lib/codeaster/NEW11.0_mpi/python*/lib/libfermd*.a
-usr/lib/codeaster/NEW11.0_mpi/bibf90
-usr/lib/codeaster/NEW11.0_mpi/bibc
-usr/lib/codeaster/NEW11.0_mpi/bibfor
-usr/lib/codeaster/NEW11.0_mpi/fermetur
-usr/lib/codeaster/NEW11.0_mpi/catapy
-usr/lib/codeaster/NEW11.0_mpi/catalo
-usr/lib/codeaster/NEW11.0_mpi/Makefile*
-usr/lib/codeaster/NEW11.0_mpi/python*/obj
+usr/lib/codeaster/STA10.6_mpi/python*/lib/libaster*.a
+usr/lib/codeaster/STA10.6_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.6_mpi/python*/lib/libferm*.a
+usr/lib/codeaster/STA10.6_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/STA10.6_mpi/bibf90
+usr/lib/codeaster/STA10.6_mpi/bibc
+usr/lib/codeaster/STA10.6_mpi/bibfor
+usr/lib/codeaster/STA10.6_mpi/fermetur
+usr/lib/codeaster/STA10.6_mpi/catapy
+usr/lib/codeaster/STA10.6_mpi/catalo
+usr/lib/codeaster/STA10.6_mpi/Makefile*
+usr/lib/codeaster/STA10.6_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=44255&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 Mon Dec 26 23:10:33 2011
@@ -1,10 +1,9 @@
-usr/lib/codeaster/NEW11.0_mpi/asteru_py*
-usr/lib/codeaster/NEW11.0_mpi/dtag
-usr/lib/codeaster/NEW11.0_mpi/materiau
-usr/lib/codeaster/NEW11.0_mpi/bibpyt
-usr/lib/codeaster/NEW11.0_mpi/python*/commande
-usr/lib/codeaster/NEW11.0_mpi/python*/cata_ele.pickled
-usr/lib/codeaster/NEW11.0_mpi/python*/elements
-usr/lib/codeaster/NEW11.0_mpi/config-py*.txt
-usr/lib/codeaster/NEW11.0_mpi/profile_py*.sh
-usr/lib/codeaster/NEW11.0_mpi/forma01a.export
+usr/lib/codeaster/STA10.6_mpi/asteru_py*
+usr/lib/codeaster/STA10.6_mpi/materiau
+usr/lib/codeaster/STA10.6_mpi/bibpyt
+usr/lib/codeaster/STA10.6_mpi/python*/commande
+usr/lib/codeaster/STA10.6_mpi/python*/cata_ele.pickled
+usr/lib/codeaster/STA10.6_mpi/python*/elements
+usr/lib/codeaster/STA10.6_mpi/config-py*.txt
+usr/lib/codeaster/STA10.6_mpi/profile_py*.sh
+usr/lib/codeaster/STA10.6_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=44255&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 Mon Dec 26 23:10:33 2011
@@ -7,8 +7,8 @@
 dc_pyvers=2.7
 
 for v in $dc_pyvers; do
-   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/NEW11.0_mpi/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/NEW11.0_mpi/config-py$v.txt /usr/lib/codeaster/NEW11.0_mpi/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.6_mpi/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.6_mpi/config-py$v.txt /usr/lib/codeaster/STA10.6_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=44255&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 Mon Dec 26 23:10:33 2011
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/NEW11.0_mpi/config.txt
+    rm -f /usr/lib/codeaster/STA10.6_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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Mon Dec 26 23:10:33 2011
@@ -1,4 +1,4 @@
-usr/lib/codeaster/NEW11.0/astest
-usr/lib/codeaster/NEW11.0/astout.export
+usr/lib/codeaster/STA10.6/astest
+usr/lib/codeaster/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi.txt Mon Dec 26 23:10:33 2011
@@ -63,7 +63,7 @@
 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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.6_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
@@ -73,7 +73,7 @@
 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
+INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA10.6_mpi/bibf90/include_mumps-4.9.2 -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/config-mpi_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_64.txt?rev=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Mon Dec 26 23:10:33 2011
@@ -63,7 +63,7 @@
 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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.6_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
@@ -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
 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
+INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA10.6_mpi/bibf90/include_mumps-4.9.2 -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6_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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config.txt (original)
+++ packages/code-aster/aster/trunk/debian/config.txt Mon Dec 26 23:10:33 2011
@@ -64,7 +64,7 @@
 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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.6/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
@@ -74,7 +74,7 @@
 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
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.6/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -112,8 +112,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/config_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config_64.txt?rev=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_64.txt Mon Dec 26 23:10:33 2011
@@ -64,7 +64,7 @@
 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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA10.6/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  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
@@ -74,7 +74,7 @@
 F90            | f90     | ?     | /usr/bin/gfortran
 OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fopenmp  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 OPTF90_O       | f90     | ?     | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8  -fopenmp
-INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/NEW11.0/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.6/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -112,8 +112,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/NEW11.0/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Mon Dec 26 23:10:33 2011
@@ -7,11 +7,10 @@
 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),
+ python-all-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,
- hostname
+ libblacs-mpi-dev, mpi-default-dev, libscotchparmetis-dev
 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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/debian-install.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/debian-install.diff Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/setup.py
+Index: aster-STA10.6.0-1/setup.py
 ===================================================================
---- 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
+--- aster-STA10.6.0-1.orig/setup.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-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,10 +10,10 @@
        'ASTER_ROOT' : '/opt/aster',
        'SOURCEDIR'  : os.path.normpath(os.path.join(setup_maindir, 'SRC')),
     }
-Index: aster-11.0.10-1/products.py
+Index: aster-STA10.6.0-1/products.py
 ===================================================================
---- 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
+--- aster-STA10.6.0-1.orig/products.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-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',

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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/README_Calibre.txt
+Index: aster-STA10.6.0-1/README_Calibre.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_Calibre.txt	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/README_Calibre.txt	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,3514 @@
 +===============================================
 +README FOR CODE_ASTER INSTALLATION ON CALIBRE 5
@@ -3517,10 +3517,10 @@
 +    ii  zlib1g-dev          1.2.3-13            compression library - development
 +    ii  zoo                 2.10-18             manipulate zoo archives
 +
-Index: aster-11.0.10-1/README_aster.html
+Index: aster-STA10.6.0-1/README_aster.html
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_aster.html	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-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">
@@ -3798,7 +3798,7 @@
 +<div class="contents topic" id="summary">
 +<p class="topic-title first">Summary</p>
 +<ul class="simple">
-+<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="#why-is-this-package-tagged-11-0-10" id="id1">Why is this package tagged STA10.6.0 ?</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>
@@ -3820,7 +3820,7 @@
 +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>
++<h1><a class="toc-backref" href="#id1">Why is this package tagged STA10.6.0 ?</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
@@ -3829,7 +3829,7 @@
 +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>
++version available at the beginning of June : STA10.6.0.</blockquote>
 +</div>
 +<div class="section" id="prerequisites-change">
 +<h1><a class="toc-backref" href="#id2">Prerequisites change</a></h1>
@@ -3919,7 +3919,7 @@
 +<li><p class="first">SRC/ : archives of Code_Aster and its prerequisites :</p>
 +<blockquote>
 +<ul class="simple">
-+<li>Code_Aster 11.0.10,</li>
++<li>Code_Aster STA10.6.0,</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>
@@ -4083,7 +4083,7 @@
 +using as_run.</p>
 +<p>Rerun the built</p>
 +<pre class="literal-block">
-+  cd /opt/aster/NEW11.0
++  cd /opt/aster/STA10.6
 +  make
 +or
 +  /opt/aster/bin/as_run --make
@@ -4120,7 +4120,7 @@
 +<li><p class="first">Change to your ASTER_ROOT directory and enter in
 +ASTER_VERSION directory</p>
 +<pre class="literal-block">
-+cd /opt/aster/NEW11.0
++cd /opt/aster/STA10.6
 +</pre>
 +</li>
 +<li><p class="first">Start the small example</p>
@@ -4135,7 +4135,7 @@
 +<li><p class="first">Change to your ASTER_ROOT directory and enter in
 +ASTER_VERSION directory</p>
 +<pre class="literal-block">
-+cd /opt/aster/NEW11.0
++cd /opt/aster/STA10.6
 +</pre>
 +</li>
 +<li><p class="first">Start the complete test suite</p>
@@ -4157,10 +4157,10 @@
 +</div>
 +</body>
 +</html>
-Index: aster-11.0.10-1/README_aster.txt
+Index: aster-STA10.6.0-1/README_aster.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/README_aster.txt	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/README_aster.txt	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,332 @@
 +README FOR CODE_ASTER INSTALLATION
 +==================================
@@ -4184,7 +4184,7 @@
 +   python setup.py --help
 +
 +
-+Why is this package tagged 11.0.10 ?
++Why is this package tagged STA10.6.0 ?
 +------------------------------------
 +
 +    Usually only stable versions of Code_Aster are packaged in an aster-full archive.
@@ -4194,7 +4194,7 @@
 +    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.
++    version available at the beginning of June : STA10.6.0.
 +
 +
 +Prerequisites change
@@ -4279,7 +4279,7 @@
 +    - setup.cfg : configuration file to adjust according to your configuration.
 +    - SRC/ : archives of Code_Aster and its prerequisites :
 +
-+        - Code_Aster 11.0.10,
++        - Code_Aster STA10.6.0,
 +        - astk 1.10.0 (Code_Aster study manager),
 +        - eficas 6.3.0 (Code_Aster commands file editor),
 +        - mumps 4.9.2 (direct solver library),
@@ -4436,7 +4436,7 @@
 +
 +   Rerun the built ::
 +
-+      cd /opt/aster/NEW11.0
++      cd /opt/aster/STA10.6
 +      make
 +    or
 +      /opt/aster/bin/as_run --make
@@ -4471,7 +4471,7 @@
 +   - Change to your ASTER_ROOT directory and enter in
 +     ASTER_VERSION directory ::
 +
-+      cd /opt/aster/NEW11.0
++      cd /opt/aster/STA10.6
 +
 +   - Start the small example ::
 +
@@ -4482,7 +4482,7 @@
 +   - Change to your ASTER_ROOT directory and enter in
 +     ASTER_VERSION directory ::
 +
-+      cd /opt/aster/NEW11.0
++      cd /opt/aster/STA10.6
 +
 +   - Start the complete test suite ::
 +
@@ -4494,10 +4494,10 @@
 +      liste_etude list to run only about 30 tests.
 +
 +
-Index: aster-11.0.10-1/__pkginfo__.py
+Index: aster-STA10.6.0-1/__pkginfo__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/__pkginfo__.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/__pkginfo__.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,35 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -4534,10 +4534,10 @@
 +author_email = "code-aster .at. edf.fr"
 +
 +
-Index: aster-11.0.10-1/as_setup.py
+Index: aster-STA10.6.0-1/as_setup.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/as_setup.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/as_setup.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,2132 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -6671,10 +6671,10 @@
 +        dict : unexpandvars_dict,
 +    }
 +    return dfunc.get(type(obj), unexpandvars_string)(obj, vars)
-Index: aster-11.0.10-1/check_compilers.py
+Index: aster-STA10.6.0-1/check_compilers.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/check_compilers.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/check_compilers.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,991 @@
 +"""
 +Configure compilers
@@ -7667,10 +7667,10 @@
 +      if verbose:
 +         return os.linesep.join(txt)
 +
-Index: aster-11.0.10-1/check_compilers_src.py
+Index: aster-STA10.6.0-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-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-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...
@@ -7768,10 +7768,10 @@
 +
 +
 +
-Index: aster-11.0.10-1/check_popen_thread.py
+Index: aster-STA10.6.0-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-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/check_popen_thread.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,50 @@
 +"""
 +Provoke the Popen bug.
@@ -7823,10 +7823,10 @@
 +   iret = main()
 +   print iret
 +
-Index: aster-11.0.10-1/mprint.py
+Index: aster-STA10.6.0-1/mprint.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/mprint.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/mprint.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,98 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -7926,10 +7926,10 @@
 +         else:
 +            print 'Unexpected object %s : %s' % (type(f), repr(f))
 +
-Index: aster-11.0.10-1/post_install.py
+Index: aster-STA10.6.0-1/post_install.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/post_install.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/post_install.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,181 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -8112,10 +8112,10 @@
 +      reinstall(d, dtrans, opts.relocated)
 +
 +
-Index: aster-11.0.10-1/products.py
+Index: aster-STA10.6.0-1/products.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/products.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/products.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,1255 @@
 +# -*- coding: utf-8 -*-
 +# ==============================================================================
@@ -9372,14 +9372,14 @@
 +
 +
 +
-Index: aster-11.0.10-1/products_versions.py
+Index: aster-STA10.6.0-1/products_versions.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/products_versions.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-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',
++dict_prod = {'aster': 'STA10.6.0',
++ 'aster-src': 'STA10.6.0',
 + 'astk': '1.10.0',
 + 'eficas': '6.3.0',
 + 'eficas-doc': '6.3.0',
@@ -9410,10 +9410,10 @@
 +                    'grace',
 +                    'eficas-doc']}
 +
-Index: aster-11.0.10-1/setup.cfg
+Index: aster-STA10.6.0-1/setup.cfg
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/setup.cfg	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/setup.cfg	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,152 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -9567,10 +9567,10 @@
 +# ZMAT libraries (commercial, available at http://www.mat.ensmp.fr/)
 +#HOME_ZMAT=''     # which contains PUBLIC/lib-Linux4/libZmat_base.so and others
 +
-Index: aster-11.0.10-1/setup.py
+Index: aster-STA10.6.0-1/setup.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ aster-11.0.10-1/setup.py	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/setup.py	2011-12-16 16:19:30.000000000 +0100
 @@ -0,0 +1,907 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-

Modified: packages/code-aster/aster/trunk/debian/patches/med_f90.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/med_f90.diff?rev=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/NEW11.0/bibf90/echange/mfchac.F
+Index: aster-STA10.6.0-1/STA10.6/bibf90/echange/mfchac.F
 ===================================================================
---- 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
+--- aster-STA10.6.0-1.orig/STA10.6/bibf90/echange/mfchac.F	2011-12-16 16:19:27.000000000 +0100
++++ aster-STA10.6.0-1/STA10.6/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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mpi.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/mpi.diff Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/products.py
+Index: aster-STA10.6.0-1/products.py
 ===================================================================
---- 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
+--- aster-STA10.6.0-1.orig/products.py	2011-12-16 16:18:51.000000000 +0100
++++ aster-STA10.6.0-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'):

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=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/setup.cfg.diff Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/setup.cfg
+Index: aster-STA10.6.0-1/setup.cfg
 ===================================================================
---- 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
+--- aster-STA10.6.0-1.orig/setup.cfg	2011-12-16 16:19:30.000000000 +0100
++++ aster-STA10.6.0-1/setup.cfg	2011-12-16 16:20:10.000000000 +0100
 @@ -10,7 +10,7 @@
  
  #-------------------------------------------------------------------------------

Modified: packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch?rev=44255&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 Mon Dec 26 23:10:33 2011
@@ -1,7 +1,7 @@
-Index: aster-11.0.10-1/NEW11.0/astest/liste_short_without_homard
+Index: aster-STA10.6.0-1/STA10.6/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-12-16 16:20:30.000000000 +0100
++++ aster-STA10.6.0-1/STA10.6/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/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=44255&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Mon Dec 26 23:10:33 2011
@@ -11,10 +11,10 @@
 PYVERS := $(shell pyversions -vr debian/control)
 
 
-STA_VERSION=NEW11.0
-PTA_VERSION=NEW11.0_mpi
-ASTER_VERSION=11.0.10
-ASTER_VERSION_FULL=$(ASTER_VERSION)-2
+STA_VERSION=STA10.6
+PTA_VERSION=STA10.6_mpi
+ASTER_VERSION=10.6.0
+ASTER_VERSION_FULL=$(ASTER_VERSION)-1
 
 DEB_SOURCE_PACKAGE := aster
 DEB_UPSTREAM_VERSION := $(ASTER_VERSION)-1
@@ -33,51 +33,51 @@
 	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 
+# Export file replacements for running tests 
 	sed -i 's:?ASTER_ROOT?:$(ASTER_ROOT):' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
 	sed -i 's:?ASTER_VERSION?:$(STA_VERSION):' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-	# Use the short test list without homard by default
+# Use the short test list without homard by default
 	sed -i '/liste_internet/ s/^/#/' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
 	sed -i 's:#\(.*liste_short.*\):#\1\n\1:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
 	sed -i '/^F/ s:liste_short:&_without_homard:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-	# Results will be in /tmp for writing permission
+# Results will be in /tmp for writing permission
 	sed -i '/resu_test/ s:$(ASTER_ROOT)/$(STA_VERSION):/tmp:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
 
-	# Remove extra license file
+# Remove extra license file
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/LICENSE.TERMS
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/GPL.txt
 
-	# Remove UMAT binaries from test cases
+# Remove UMAT binaries from test cases
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001a.44
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001b.44
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.44
 	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.46
 
-	# Add as_test.sh 
+# 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
-	
+	chmod 755 $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/as_test.sh
 	touch $@
 
 
 clean:
 	dh_testdir
 	dh_testroot
-	# Default cleaning
+# Default cleaning
 	rm -f setup.cache setup.dbg* setup.log*
 	rm -f variables.init cfg___main__ cfg_aster
 	-find . -name "*.pyc" -exec rm {} \;
 	-rm -rf *-stamp
-	# Removing patches
+# Removing patches
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	# Removing build and install tree
+# Removing build and install tree
 	rm -rf $(DEB_DESTDIR)
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	#
+#
 	set -ex; \
 	for v in $(PYVERS); do \
 	   cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/profile_py$$v.sh; \
@@ -96,9 +96,9 @@
 	mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/outils
 	ln -sf /usr/bin/onmetis $(DEB_DESTDIR)/$(ASTER_ROOT)/outils
 	ln -sf /usr/bin/onmetis.exe $(DEB_DESTDIR)/$(ASTER_ROOT)/outils
-	
-	#
-	# For MPI version
+
+#
+# For MPI version
 	set -ex; \
 	for v in $(PYVERS); do \
 	   cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/profile_py$$v.sh; \
@@ -115,12 +115,13 @@
 	   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?
-	# 5. disable openmp?
+#
+# 4. change mumps_scotch to mumps_ptscotch?
+# 5. disable openmp?
 
-	#
+#
 	find . -name "*.pyc" -exec rm {} \;
+	find . -type d -empty -delete
 	dh_install --sourcedir=debian/tmp --list-missing
 
 # Build architecture-independent files here.
@@ -132,8 +133,8 @@
 	dh_installexamples -i
 	dh_installman -i
 	dh_installchangelogs -i
-	
-	#install aster-test
+
+#install aster-test
 	dh_install --sourcedir=debian/tmp -pcode-aster-test
 	dh_link -i
 	dh_compress -i
@@ -169,15 +170,15 @@
 .PHONY: build clean binary-indep binary-arch binary install configure
 
 get-orig-source:
-	# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
+# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	mkdir -p tmp
 	cd tmp && wget "http://www.code-aster.org/FICHIERS/aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz"
-	
-	# Go to SRC directory and retreive aster 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
 	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