r45369 - in /packages/code-aster/aster/trunk/debian: ./ patches/
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Sat Sep 29 19:25:16 UTC 2012
Author: apalazzi-guest
Date: Sat Sep 29 19:25:15 2012
New Revision: 45369
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45369
Log:
Several enhancements to the package.
Modified package so that version numbers are no longer present
in the directory tree; this was rather annoying when updating
the package to a new upstream version. Now versions are called
STABLE and STABLE_MPI, and postinst script will create a symlink
with the actual version (e.g. STA10.7 will point to STABLE).
Modified postinst scripts so that the config.txt files aren't
modified: this does not seems to be required (bug #688737)
Also now the package will create files in /var/lib/codeaster
with names corresponding to the installed engine version; this
will help to fix bug #670567 in the right way.
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/patches/edf-install.patch
packages/code-aster/aster/trunk/debian/patches/med_f90.diff
packages/code-aster/aster/trunk/debian/patches/mumps-4.10.0.patch
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/code-aster-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-dev.install?rev=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-dev.install Sat Sep 29 19:25:15 2012
@@ -1,10 +1,10 @@
-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
+usr/lib/codeaster/STABLE/python*/lib/libaster.a
+usr/lib/codeaster/STABLE/python*/lib/libferm.a
+usr/lib/codeaster/STABLE/bibf90
+usr/lib/codeaster/STABLE/bibc
+usr/lib/codeaster/STABLE/bibfor
+usr/lib/codeaster/STABLE/fermetur
+usr/lib/codeaster/STABLE/catapy
+usr/lib/codeaster/STABLE/catalo
+usr/lib/codeaster/STABLE/Makefile*
+usr/lib/codeaster/STABLE/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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine-dbg.install Sat Sep 29 19:25:15 2012
@@ -1,3 +1,3 @@
-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
+usr/lib/codeaster/STABLE/asterd_py*
+usr/lib/codeaster/STABLE/python*/lib/libasterd.a
+usr/lib/codeaster/STABLE/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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.install Sat Sep 29 19:25:15 2012
@@ -1,11 +1,12 @@
-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/STABLE/asteru_py*
+usr/lib/codeaster/STABLE/materiau
+usr/lib/codeaster/STABLE/bibpyt
+usr/lib/codeaster/STABLE/python*/commande
+usr/lib/codeaster/STABLE/python*/cata_ele.pickled
+usr/lib/codeaster/STABLE/python*/elements
+usr/lib/codeaster/STABLE/config-py*.txt
+usr/lib/codeaster/STABLE/profile_py*.sh
+usr/lib/codeaster/STABLE/forma01a.export
usr/lib/codeaster/outils/onmetis*
-usr/lib/codeaster/STA10.7/forma01a.export
+usr/lib/codeaster/STABLE/forma01a.export
+var/lib/codeaster/STABLE
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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postinst Sat Sep 29 19:25:15 2012
@@ -2,13 +2,18 @@
set -ex
-dc_hostname="$(hostname 2>/dev/null)"
-#dc_pyvers="$(pyversions -s | perl -pi -e 's|python||g')"
-dc_pyvers=2.7
+CODEASTER_VERSION=STA10.7
+
+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.7/config-py$v.txt; \
- ln -sf /usr/lib/codeaster/STA10.7/config-py$v.txt /usr/lib/codeaster/STA10.7/config.txt; \
-done
+ ln -sf /usr/lib/codeaster/STABLE/config-py$v.txt /usr/lib/codeaster/STABLE/config.txt; \
+done
+
+# recreate the "usual" directory structure
+ln -s /usr/lib/codeaster/STABLE /usr/lib/codeaster/$CODEASTER_VERSION
+
+# add numbered version to available versions
+ln -s /var/lib/codeaster/STABLE /var/lib/codeaster/$(CODEASTER_VERSION)
#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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-engine.postrm Sat Sep 29 19:25:15 2012
@@ -2,8 +2,12 @@
set -ex
+CODEASTER_VERSION=STA10.7
+
if [ "$1" = "purge" ]; then
- rm -f /usr/lib/codeaster/STA10.7/config.txt
+ rm -f /usr/lib/codeaster/STABLE/config.txt
fi
+
+rm -f /var/lib/codeaster/$(CODEASTER_VERSION)
#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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-dbg.install Sat Sep 29 19:25:15 2012
@@ -1,3 +1,3 @@
-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
+usr/lib/codeaster/STABLE_MPI/asterd_py*
+usr/lib/codeaster/STABLE_MPI/python*/lib/libasterd*.a
+usr/lib/codeaster/STABLE_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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine-dev.install Sat Sep 29 19:25:15 2012
@@ -1,12 +1,12 @@
-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
+usr/lib/codeaster/STABLE_MPI/python*/lib/libaster*.a
+usr/lib/codeaster/STABLE_MPI/python*/lib/libasterd*.a
+usr/lib/codeaster/STABLE_MPI/python*/lib/libferm*.a
+usr/lib/codeaster/STABLE_MPI/python*/lib/libfermd*.a
+usr/lib/codeaster/STABLE_MPI/bibf90
+usr/lib/codeaster/STABLE_MPI/bibc
+usr/lib/codeaster/STABLE_MPI/bibfor
+usr/lib/codeaster/STABLE_MPI/fermetur
+usr/lib/codeaster/STABLE_MPI/catapy
+usr/lib/codeaster/STABLE_MPI/catalo
+usr/lib/codeaster/STABLE_MPI/Makefile*
+usr/lib/codeaster/STABLE_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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.install Sat Sep 29 19:25:15 2012
@@ -1,9 +1,10 @@
-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
+usr/lib/codeaster/STABLE_MPI/asteru_py*
+usr/lib/codeaster/STABLE_MPI/materiau
+usr/lib/codeaster/STABLE_MPI/bibpyt
+usr/lib/codeaster/STABLE_MPI/python*/commande
+usr/lib/codeaster/STABLE_MPI/python*/cata_ele.pickled
+usr/lib/codeaster/STABLE_MPI/python*/elements
+usr/lib/codeaster/STABLE_MPI/config-py*.txt
+usr/lib/codeaster/STABLE_MPI/profile_py*.sh
+usr/lib/codeaster/STABLE_MPI/forma01a.export
+var/lib/codeaster/STABLE_MPI
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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postinst Sat Sep 29 19:25:15 2012
@@ -2,13 +2,18 @@
set -ex
-dc_hostname="$(hostname 2>/dev/null)"
-#dc_pyvers="$(pyversions -s | perl -pi -e 's|python||g')"
-dc_pyvers=2.7
+CODEASTER_VERSION=STA10.7_MPI
+
+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.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
+ ln -sf /usr/lib/codeaster/STABLE_MPI/config-py$v.txt /usr/lib/codeaster/STABLE_MPI/config.txt; \
+done
+
+# recreate the "usual" directory structure
+ln -s /usr/lib/codeaster/STABLE /usr/lib/codeaster/$CODEASTER_VERSION
+
+# add numbered version to available versions
+ln -s /var/lib/codeaster/STABLE_MPI /var/lib/codeaster/$(CODEASTER_VERSION)
#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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-mpi-engine.postrm Sat Sep 29 19:25:15 2012
@@ -2,8 +2,12 @@
set -ex
+CODEASTER_VERSION=STA10.7_MPI
+
if [ "$1" = "purge" ]; then
- rm -f /usr/lib/codeaster/STA10.7_mpi/config.txt
+ rm -f /usr/lib/codeaster/STABLE_MPI/config.txt
fi
+rm -f /var/lib/codeaster/$(CODEASTER_VERSION)
+
#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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Sat Sep 29 19:25:15 2012
@@ -1,4 +1,4 @@
-usr/lib/codeaster/STA10.7/astest
-usr/lib/codeaster/STA10.7/astout.export
+usr/lib/codeaster/STABLE/astest
+usr/lib/codeaster/STABLE/astout.export
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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/edf-install.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/edf-install.patch Sat Sep 29 19:25:15 2012
@@ -4083,7 +4083,7 @@
+using as_run.</p>
+<p>Rerun the built</p>
+<pre class="literal-block">
-+ cd /opt/aster/STA10.6
++ cd /opt/aster/STABLE
+ 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/STA10.6
++cd /opt/aster/STABLE
+</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/STA10.6
++cd /opt/aster/STABLE
+</pre>
+</li>
+<li><p class="first">Start the complete test suite</p>
@@ -4436,7 +4436,7 @@
+
+ Rerun the built ::
+
-+ cd /opt/aster/STA10.6
++ cd /opt/aster/STABLE
+ 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/STA10.6
++ cd /opt/aster/STABLE
+
+ - Start the small example ::
+
@@ -4482,7 +4482,7 @@
+ - Change to your ASTER_ROOT directory and enter in
+ ASTER_VERSION directory ::
+
-+ cd /opt/aster/STA10.6
++ cd /opt/aster/STABLE
+
+ - Start the complete test suite ::
+
@@ -9378,8 +9378,8 @@
+++ aster-10.6.0-1/products_versions.py 2012-04-04 22:31:29.000000000 +0200
@@ -0,0 +1,33 @@
+
-+dict_prod = {'aster': 'STA10.6.0',
-+ 'aster-src': 'STA10.6.0',
++dict_prod = {'aster': 'STA10.7',
++ 'aster-src': 'STA10.7.0',
+ 'astk': '1.10.0',
+ 'eficas': '6.3.0',
+ 'eficas-doc': '6.3.0',
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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/med_f90.diff (original)
+++ packages/code-aster/aster/trunk/debian/patches/med_f90.diff Sat Sep 29 19:25:15 2012
@@ -1,7 +1,7 @@
-Index: aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F
+Index: aster-10.6.0-1/STABLE/bibf90/echange/mfchac.F
===================================================================
---- aster-10.6.0-1.orig/STA10.6/bibf90/echange/mfchac.F 2012-01-11 16:12:03.000000000 +0100
-+++ aster-10.6.0-1/STA10.6/bibf90/echange/mfchac.F 2012-04-04 22:31:29.000000000 +0200
+--- aster-10.6.0-1.orig/STABLE/bibf90/echange/mfchac.F 2012-01-11 16:12:03.000000000 +0100
++++ aster-10.6.0-1/STABLE/bibf90/echange/mfchac.F 2012-04-04 22:31:29.000000000 +0200
@@ -23,8 +23,6 @@
CHARACTER*80 UNIDT
INTEGER FID, NCOMP, CRET, TYPE
Modified: packages/code-aster/aster/trunk/debian/patches/mumps-4.10.0.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/patches/mumps-4.10.0.patch?rev=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/mumps-4.10.0.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/mumps-4.10.0.patch Sat Sep 29 19:25:15 2012
@@ -1,5 +1,5 @@
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/cmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/cmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -77,7 +77,7 @@
+!
+ END TYPE CMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/cmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/cmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -345,7 +345,7 @@
+ TYPE (CMUMPS_ROOT_STRUC) :: root
+ END TYPE CMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/dmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/dmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -423,7 +423,7 @@
+!
+ END TYPE DMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/dmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/dmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -691,7 +691,7 @@
+ TYPE (DMUMPS_ROOT_STRUC) :: root
+ END TYPE DMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/mpif.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/mpif.h
@@ -0,0 +1,114 @@
+!
+! This file is part of MUMPS 4.9.2, built on Thu Nov 5 07:05:08 UTC 2009
@@ -808,7 +808,7 @@
+ DOUBLE PRECISION MPI_WTIME
+ EXTERNAL MPI_WTIME
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/mumps_compat.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/mumps_compat.h
@@ -0,0 +1,78 @@
+/*
+ *
@@ -889,7 +889,7 @@
+
+#endif /* MUMPS_COMPAT_H */
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/smumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/smumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -967,7 +967,7 @@
+!
+ END TYPE SMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/smumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/smumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -1235,7 +1235,7 @@
+ TYPE (SMUMPS_ROOT_STRUC) :: root
+ END TYPE SMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/zmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/zmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -1313,7 +1313,7 @@
+!
+ END TYPE ZMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0/zmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0/zmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -1581,7 +1581,7 @@
+ TYPE (ZMUMPS_ROOT_STRUC) :: root
+ END TYPE ZMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/cmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/cmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -1659,7 +1659,7 @@
+!
+ END TYPE CMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/cmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/cmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -1927,7 +1927,7 @@
+ TYPE (CMUMPS_ROOT_STRUC) :: root
+ END TYPE CMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/dmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/dmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -2005,7 +2005,7 @@
+!
+ END TYPE DMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/dmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/dmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -2273,7 +2273,7 @@
+ TYPE (DMUMPS_ROOT_STRUC) :: root
+ END TYPE DMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/mumps_compat.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/mumps_compat.h
@@ -0,0 +1,78 @@
+/*
+ *
@@ -2354,7 +2354,7 @@
+
+#endif /* MUMPS_COMPAT_H */
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/smumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/smumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -2432,7 +2432,7 @@
+!
+ END TYPE SMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/smumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/smumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -2700,7 +2700,7 @@
+ TYPE (SMUMPS_ROOT_STRUC) :: root
+ END TYPE SMUMPS_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/zmumps_root.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/zmumps_root.h
@@ -0,0 +1,75 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
@@ -2778,7 +2778,7 @@
+!
+ END TYPE ZMUMPS_ROOT_STRUC
--- /dev/null
-+++ b/STA10.6/bibf90/include_mumps-4.10.0_mpi/zmumps_struc.h
++++ b/STABLE/bibf90/include_mumps-4.10.0_mpi/zmumps_struc.h
@@ -0,0 +1,265 @@
+!
+! This file is part of MUMPS 4.10.0, built on Tue May 10 12:56:32 UTC 2011
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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch (original)
+++ packages/code-aster/aster/trunk/debian/patches/tests_without_homard.patch Sat Sep 29 19:25:15 2012
@@ -1,7 +1,7 @@
-Index: aster-10.6.0-1/STA10.6/astest/liste_short_without_homard
+Index: aster-10.6.0-1/STABLE/astest/liste_short_without_homard
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ aster-10.6.0-1/STA10.6/astest/liste_short_without_homard 2012-04-04 22:31:29.000000000 +0200
++++ aster-10.6.0-1/STABLE/astest/liste_short_without_homard 2012-04-04 22:31:29.000000000 +0200
@@ -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=45369&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Sat Sep 29 19:25:15 2012
@@ -10,8 +10,9 @@
PYVERS := $(shell pyversions -vr debian/control)
-STA_VERSION=STA10.7
-PTA_VERSION=STA10.7_mpi
+STA_UPSTREAM_VERSION=STA10.7
+STA_VERSION=STABLE
+PTA_VERSION=STABLE_MPI
ASTER_VERSION=10.7.0
ASTER_VERSION_FULL=$(ASTER_VERSION)-1
@@ -20,6 +21,10 @@
ASTER_ROOT=$(shell echo `grep "export ASTER_ROOT=" /etc/codeaster/profile.sh | sed 's/export ASTER_ROOT=//'`)
export ASTER_ROOT
+
+ASTER_VAR_ROOT=var/lib/codeaster # check this
+export ASTER_VAR_ROOT
+
export DEB_DESTDIR=$(CURDIR)/debian/tmp
ASTOUT_EXPORT=$(STA_VERSION)/astout.export
@@ -36,6 +41,9 @@
# Remove extra license file
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/LICENSE.TERMS
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/GPL.txt
+# create status file in /var/lib/codeaster
+ mkdir -p $(DEB_DESTDIR)/$(ASTER_VAR_ROOT)
+ touch $(DEB_DESTDIR)/$(ASTER_VAR_ROOT)/$(STA_VERSION)
HOME=$(DEB_DESTDIR); \
set -ex; \
@@ -66,6 +74,9 @@
# Remove extra license file
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/LICENSE.TERMS
rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/GPL.txt
+# create status file in /var/lib/codeaster
+ mkdir -p $(DEB_DESTDIR)/$(ASTER_VAR_ROOT)
+ touch $(DEB_DESTDIR)/$(ASTER_VAR_ROOT)/$(STA_VERSION)
# For MPI version
HOME=$(DEB_DESTDIR); \
@@ -198,7 +209,7 @@
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 && mv $(UPSTREAM_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