r45365 - /packages/code-aster/aster/trunk/debian/

apalazzi-guest at users.alioth.debian.org apalazzi-guest at users.alioth.debian.org
Fri Sep 28 18:54:55 UTC 2012


Author: apalazzi-guest
Date: Fri Sep 28 18:54:54 2012
New Revision: 45365

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45365
Log:
Updated to upstream 10.7

Updated fises to upstream version 10.7 and modified rules file to make
easier the switch to new upstream versions.


Modified:
    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_32.txt
    packages/code-aster/aster/trunk/debian/config-mpi_64.txt
    packages/code-aster/aster/trunk/debian/config_32.txt
    packages/code-aster/aster/trunk/debian/config_64.txt
    packages/code-aster/aster/trunk/debian/rules

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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-dev.install Fri Sep 28 18:54:54 2012
@@ -1,10 +1,10 @@
-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
+usr/lib/codeaster/STA10.7/python*/lib/libaster.a
+usr/lib/codeaster/STA10.7/python*/lib/libferm.a
+usr/lib/codeaster/STA10.7/bibf90
+usr/lib/codeaster/STA10.7/bibc
+usr/lib/codeaster/STA10.7/bibfor
+usr/lib/codeaster/STA10.7/fermetur
+usr/lib/codeaster/STA10.7/catapy
+usr/lib/codeaster/STA10.7/catalo
+usr/lib/codeaster/STA10.7/Makefile*
+usr/lib/codeaster/STA10.7/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=45365&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 Fri Sep 28 18:54:54 2012
@@ -1,3 +1,3 @@
-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
+usr/lib/codeaster/STA10.7/asterd_py*
+usr/lib/codeaster/STA10.7/python*/lib/libasterd.a
+usr/lib/codeaster/STA10.7/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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.install Fri Sep 28 18:54:54 2012
@@ -1,11 +1,11 @@
-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/STA10.7/asteru_py*
+usr/lib/codeaster/STA10.7/materiau
+usr/lib/codeaster/STA10.7/bibpyt
+usr/lib/codeaster/STA10.7/python*/commande
+usr/lib/codeaster/STA10.7/python*/cata_ele.pickled
+usr/lib/codeaster/STA10.7/python*/elements
+usr/lib/codeaster/STA10.7/config-py*.txt
+usr/lib/codeaster/STA10.7/profile_py*.sh
+usr/lib/codeaster/STA10.7/forma01a.export
 usr/lib/codeaster/outils/onmetis*
-usr/lib/codeaster/STA10.6/forma01a.export
+usr/lib/codeaster/STA10.7/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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Fri Sep 28 18:54:54 2012
@@ -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/STA10.6/config-py$v.txt; \
-   ln -sf /usr/lib/codeaster/STA10.6/config-py$v.txt /usr/lib/codeaster/STA10.6/config.txt; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.7/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.7/config-py$v.txt /usr/lib/codeaster/STA10.7/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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Fri Sep 28 18:54:54 2012
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.6/config.txt
+    rm -f /usr/lib/codeaster/STA10.7/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=45365&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 Fri Sep 28 18:54:54 2012
@@ -1,3 +1,3 @@
-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
+usr/lib/codeaster/STA10.7_mpi/asterd_py*
+usr/lib/codeaster/STA10.7_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.7_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=45365&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 Fri Sep 28 18:54:54 2012
@@ -1,12 +1,12 @@
-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
+usr/lib/codeaster/STA10.7_mpi/python*/lib/libaster*.a
+usr/lib/codeaster/STA10.7_mpi/python*/lib/libasterd*.a
+usr/lib/codeaster/STA10.7_mpi/python*/lib/libferm*.a
+usr/lib/codeaster/STA10.7_mpi/python*/lib/libfermd*.a
+usr/lib/codeaster/STA10.7_mpi/bibf90
+usr/lib/codeaster/STA10.7_mpi/bibc
+usr/lib/codeaster/STA10.7_mpi/bibfor
+usr/lib/codeaster/STA10.7_mpi/fermetur
+usr/lib/codeaster/STA10.7_mpi/catapy
+usr/lib/codeaster/STA10.7_mpi/catalo
+usr/lib/codeaster/STA10.7_mpi/Makefile*
+usr/lib/codeaster/STA10.7_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=45365&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 Fri Sep 28 18:54:54 2012
@@ -1,9 +1,9 @@
-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
+usr/lib/codeaster/STA10.7_mpi/asteru_py*
+usr/lib/codeaster/STA10.7_mpi/materiau
+usr/lib/codeaster/STA10.7_mpi/bibpyt
+usr/lib/codeaster/STA10.7_mpi/python*/commande
+usr/lib/codeaster/STA10.7_mpi/python*/cata_ele.pickled
+usr/lib/codeaster/STA10.7_mpi/python*/elements
+usr/lib/codeaster/STA10.7_mpi/config-py*.txt
+usr/lib/codeaster/STA10.7_mpi/profile_py*.sh
+usr/lib/codeaster/STA10.7_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=45365&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 Fri Sep 28 18:54:54 2012
@@ -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/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; \
+   perl -pi -e "s|^ID_PERF.*|ID_PERF        \| id      \| \-     \| $dc_hostname|" /usr/lib/codeaster/STA10.7_mpi/config-py$v.txt; \
+   ln -sf /usr/lib/codeaster/STA10.7_mpi/config-py$v.txt /usr/lib/codeaster/STA10.7_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=45365&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 Fri Sep 28 18:54:54 2012
@@ -3,7 +3,7 @@
 set -ex
 
 if [ "$1" = "purge" ]; then
-    rm -f /usr/lib/codeaster/STA10.6_mpi/config.txt
+    rm -f /usr/lib/codeaster/STA10.7_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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Fri Sep 28 18:54:54 2012
@@ -1,4 +1,4 @@
-usr/lib/codeaster/STA10.6/astest
-usr/lib/codeaster/STA10.6/astout.export
+usr/lib/codeaster/STA10.7/astest
+usr/lib/codeaster/STA10.7/astout.export
 
 

Modified: packages/code-aster/aster/trunk/debian/config-mpi_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_32.txt?rev=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_32.txt Fri Sep 28 18:54:54 2012
@@ -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/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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION_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/STA10.6_mpi/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
+INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION_mpi/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION_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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Fri Sep 28 18:54:54 2012
@@ -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/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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION_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/STA10.6_mpi/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
+INCLF90        | include | ?     |  -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION_mpi/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #
@@ -111,8 +111,8 @@
 MAKE_CAPY_OFFI  | build  | 11-04 | Lecture_Cata_Ele/make_capy_offi.py
 #
 REPOUT         | exec    | 11-04 | /ASTER_ROOT/outils
-REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6_mpi/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION_mpi/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION_mpi/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/config_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config_32.txt?rev=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_32.txt Fri Sep 28 18:54:54 2012
@@ -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/STA10.6/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/STA_VERSION/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/STA10.6/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/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/STA10.6/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION/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=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_64.txt Fri Sep 28 18:54:54 2012
@@ -64,7 +64,7 @@
 CC             | cc      | ?     | /usr/bin/gcc
 OPTC_D         | cc      | ?     | -c -g  -fno-stack-protector -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 OPTC_O         | cc      | ?     | -c -O2 -fno-tree-dse -fno-stack-protector -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-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
+INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/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 -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA10.6/bibf90/include_mumps-4.9.2 -I/usr/include/mpi
+INCLF90        | include | ?     |  -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/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/STA10.6/materiau
-REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA10.6/datg
+REPMAT         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION/materiau
+REPDEX         | exec    | 02-05 | /ASTER_ROOT/STA_VERSION/datg
 #
 SUPERV         | exec    | 03-02 | Accas
 SUPERV         | exec    | 03-02 | Build

Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=45365&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Fri Sep 28 18:54:54 2012
@@ -10,10 +10,10 @@
 
 PYVERS := $(shell pyversions -vr debian/control)
 
-STA_VERSION=STA10.6
-PTA_VERSION=STA10.6_mpi
-ASTER_VERSION=10.6.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-3
+STA_VERSION=STA10.7
+PTA_VERSION=STA10.7_mpi
+ASTER_VERSION=10.7.0
+ASTER_VERSION_FULL=$(ASTER_VERSION)-1
 
 DEB_SOURCE_PACKAGE := aster
 DEB_UPSTREAM_VERSION := $(ASTER_VERSION)-1
@@ -41,9 +41,10 @@
 	set -ex; \
 	for v in $(PYVERS); do \
 	   cp -f debian/profile.sh $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/profile_py$$v.sh; \
+	   cp -f debian/config_$(XXBITS).txt  $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+           perl -pi -e "s|STA_VERSION|$(STA_VERSION)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
 	   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_$(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; \
@@ -63,17 +64,18 @@
 	mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag
 	cp -r $(STA_VERSION)/* $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)
 # Remove extra license file
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/LICENSE.TERMS
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/GPL.txt
+	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/LICENSE.TERMS
+	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/GPL.txt
 
 # For MPI version
 	HOME=$(DEB_DESTDIR); \
 	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; \
+	   cp -f debian/config-mpi_$(XXBITS).txt  $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+           perl -pi -e "s|STA_VERSION|$(PTA_VERSION)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+	   perl -pi -e "s|HOSTNAME|$(HOSTNAME)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_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_$(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; \




More information about the debian-science-commits mailing list