r45377 - in /packages/code-aster/aster/trunk/debian: changelog config-mpi_32.txt config-mpi_64.txt config_32.txt config_64.txt control

apalazzi-guest at users.alioth.debian.org apalazzi-guest at users.alioth.debian.org
Fri Oct 5 10:46:41 UTC 2012


Author: apalazzi-guest
Date: Fri Oct  5 10:46:41 2012
New Revision: 45377

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45377
Log:
Various updates.

Removed dependency from mumps-4.9.2 that is not in sid.
Removed define H5_USE_16_API, no longer required.
Updated compiler call to use gfortran-4.6 in serial build; for
parallel build the work is still ongoing.


Modified:
    packages/code-aster/aster/trunk/debian/changelog
    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/control

Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Fri Oct  5 10:46:41 2012
@@ -1,3 +1,10 @@
+aster (10.7.0-1-1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 
+
+ -- andrea <andrea at atlante.lan>  Sat, 29 Sep 2012 21:41:49 +0200
+
 aster (10.6.0-1-4) unstable; urgency=low
 
   * Fix "FTBFS without writable home directory"

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=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_32.txt Fri Oct  5 10:46:41 2012
@@ -43,7 +43,7 @@
 BIBL           | med     | 2.3.5 | -L/usr/lib -lmed
 BIBL           | hdf5    | 1.6.5 | -L/usr/lib -lhdf5
 BIBL           | zmat    | 8.4   | 
-BIBL           | mumps   | 4.9.2 | -L/usr/lib -ldmumps_ptscotch-4.9.2 -lzmumps_ptscotch-4.9.2 -lsmumps_ptscotch-4.9.2 -lcmumps_ptscotch-4.9.2 -lmumps_common_ptscotch-4.9.2 -lpord_ptscotch-4.9.2 -lesmumps-4.9.2 -lscotch -lscotchmetis
+BIBL           | mumps   | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -lzmumps_ptscotch -lsmumps_ptscotch -lcmumps_ptscotch -lmumps_common_ptscotch -lpord_ptscotch -lesmumps -lscotch -lscotchmetis
 BIBL           | scotch  | 4.0   | -L/usr/lib -lptscotch -lptscotcherr -lptscotcherrexit
 BIBL           | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
 BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
@@ -51,7 +51,7 @@
 BIBL           | c++     | ?     | -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
 #
-DEFS           | defined | ?     | LINUX _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI
+DEFS           | defined | ?     | LINUX _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI
 #
 NOBUILD        | option  | ?     |  
 #
@@ -63,9 +63,9 @@
 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/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
+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 -I/usr/include/mpi
 #
-F77            | f77     | ?     | /usr/bin/mpif90
+F77            | f77     | ?     | /usr/bin/mpif77
 OPTF_D         | f77     | ?     | -c -g  -fPIC
 OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse -fPIC
 INCLF          | include | ?     | -I/usr/include -I/usr/include/mpi
@@ -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/STA_VERSION_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/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #

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=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Fri Oct  5 10:46:41 2012
@@ -43,7 +43,7 @@
 BIBL           | med     | 2.3.5 | -L/usr/lib -lmed
 BIBL           | hdf5    | 1.6.5 | -L/usr/lib -lhdf5
 BIBL           | zmat    | 8.4   | 
-BIBL           | mumps   | 4.9.2 | -L/usr/lib -ldmumps_ptscotch-4.9.2 -lzmumps_ptscotch-4.9.2 -lsmumps_ptscotch-4.9.2 -lcmumps_ptscotch-4.9.2 -lmumps_common_ptscotch-4.9.2 -lpord_ptscotch-4.9.2 -lesmumps-4.9.2 -lscotch -lscotchmetis
+BIBL           | mumps   | 4.9.2 | -L/usr/lib -ldmumps_ptscotch -lzmumps_ptscotch -lsmumps_ptscotch -lcmumps_ptscotch -lmumps_common_ptscotch -lpord_ptscotch -lesmumps -lscotch -lscotchmetis
 BIBL           | scotch  | 4.0   | -L/usr/lib -lptscotch -L/usr/lib -lptscotcherr -L/usr/lib -lptscotcherrexit
 BIBL           | scalapack | 1.8 | -lscalapack-openmpi -lblacs-openmpi -lblacsF77init-openmpi
 BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
@@ -51,7 +51,7 @@
 BIBL           | c++     | ?     | -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
 #
-DEFS           | defined | ?     | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5_USE_16_API H5PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS           | defined | ?     | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI _USE_MED_SHORT_INT
 #
 NOBUILD        | option  | ?     |  
 #
@@ -61,19 +61,19 @@
 OPTL           | link    | ?     | 
 #
 CC             | cc      | ?     | /usr/bin/mpicc
-OPTC_D         | cc      | ?     | -c -g  -fno-stack-protector -fPIC
-OPTC_O         | cc      | ?     | -c -O2 -fno-tree-dse -fno-stack-protector -fPIC
-INCL           | include | ?     | -IDEB_DESTDIR/ASTER_ROOT/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
+OPTC_D         | cc      | ?     | -v -c -g  -fno-stack-protector -fPIC
+OPTC_O         | cc      | ?     | -v -c -O2 -fno-tree-dse -fno-stack-protector -fPIC
+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 -I/usr/include/mpi
 #
-F77            | f77     | ?     | /usr/bin/mpif90
-OPTF_D         | f77     | ?     | -c -g  -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+F77            | f77     | ?     | /usr/bin/mpif77
+OPTF_D         | f77     | ?     | -v -c -g  -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF_O         | f77     | ?     | -v -c -O2 -fno-tree-dse -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 INCLF          | include | ?     | -I/usr/include -I/usr/include/mpi
 #
 F90            | f90     | ?     | /usr/bin/mpif90
-OPTF90_D       | f90     | ?     | -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-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/STA_VERSION_mpi/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
+OPTF90_D       | f90     | ?     | -v -c -g  -ffixed-line-length-0 -x f77-cpp-input -fPIC  -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF90_O       | f90     | ?     | -v -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/STA_VERSION/bibf90/include_mumps-4.9.2_mpi -I/usr/include -I/usr/include/mpi
 #
 G77_AGLA       | g77     | ?     | unused
 #

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=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_32.txt Fri Oct  5 10:46:41 2012
@@ -45,33 +45,33 @@
 BIBL           | med     | 2.3.5 | -L/usr/lib -lmed
 BIBL           | hdf5    | 1.6.5 | -L/usr/lib -lhdf5
 BIBL           | zmat    | 8.4   | 
-BIBL           | mumps   | ?     | -L/usr/lib -ldmumps_seq-4.9.2 -lzmumps_seq-4.9.2 -lsmumps_seq-4.9.2 -lcmumps_seq-4.9.2 -lmumps_common_seq-4.9.2 -lpord_seq-4.9.2 -lmpiseq_seq-4.9.2 -lscotchmetis -lscotch
-BIBL           | scotch  | 4.0   | -L/usr/lib -lesmumps-4.9.2 -lscotch -lscotcherr
-BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
+BIBL           | mumps   | ?     | -L/usr/lib -ldmumps_seq -lzmumps_seq -lsmumps_seq -lcmumps_seq -lmumps_common_seq -lpord_seq -lmpiseq_seq -lscotchmetis -lscotch
+BIBL           | scotch  | 4.0   | -L/usr/lib -lesmumps -lscotch -lscotcherr
+BIBL           | math    | ?     | -L/usr/lib -llapack -lblas
 BIBL           | mpi     | 2     | 
 BIBL           | c++     | ?     | -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -L/usr/lib -ldl -L/usr/lib -lutil -L/usr/lib -lm -lpthread -lz
 #
-DEFS           | defined | ?     | LINUX H5_USE_16_API _HAVE_MUMPS H5_PART_HAS_MPI
+DEFS           | defined | ?     | LINUX  _HAVE_MUMPS H5_PART_HAS_MPI
 #
 NOBUILD        | option  | ?     | 
 #
 PYTHON         | python  | PYVER   | /usr/bin/pythonPYVER
 #
-LINK           | link    | ?     | /usr/bin/gfortran
+LINK           | link    | ?     | /usr/bin/gfortran-4.6
 OPTL           | link    | ?     | -fopenmp
 #
-CC             | cc      | ?     | /usr/bin/gcc
+CC             | cc      | ?     | /usr/bin/gcc-4.6
 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/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
+F77            | f77     | ?     | /usr/bin/gfortran-4.6
 OPTF_D         | f77     | ?     | -c -g  -fPIC  -fopenmp
 OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse  -fopenmp
 INCLF          | include | ?     | -I/usr/include/mpi
 #
-F90            | f90     | ?     | /usr/bin/gfortran
+F90            | f90     | ?     | /usr/bin/gfortran-4.6
 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/STA_VERSION/bibf90/include_mumps-4.9.2 -I/usr/include/mpi

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=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_64.txt Fri Oct  5 10:46:41 2012
@@ -45,33 +45,33 @@
 BIBL           | med     | 2.3.5 | -L/usr/lib -lmed
 BIBL           | hdf5    | 1.6.5 | -L/usr/lib -lhdf5
 BIBL           | zmat    | 8.4   | 
-BIBL           | mumps   | ?     | -L/usr/lib -ldmumps_seq-4.9.2 -lzmumps_seq-4.9.2 -lsmumps_seq-4.9.2 -lcmumps_seq-4.9.2 -lmumps_common_seq-4.9.2 -lpord_seq-4.9.2 -lmpiseq_seq-4.9.2 -lscotchmetis -lscotch
-BIBL           | scotch  | 4.0   | -L/usr/lib -lesmumps-4.9.2 -lscotch -lscotcherr
+BIBL           | mumps   | ?     | -L/usr/lib -ldmumps_seq -lzmumps_seq -lsmumps_seq -lcmumps_seq -lmumps_common_seq -lpord_seq -lmpiseq_seq -lscotchmetis -lscotch
+BIBL           | scotch  | 4.0   | -L/usr/lib -lesmumps -lscotch -lscotcherr
 BIBL           | math    | ?     | -L/usr/lib -llapack -L/usr/lib -lblas -lgfortran
 BIBL           | mpi     | 2     | 
 BIBL           | c++     | ?     | -lstdc++ -lsupc++
 BIBL           | sys     | ?     | -Wl,--allow-multiple-definition -Wl,--export-dynamic -L/usr/lib -ldl -L/usr/lib -lutil -L/usr/lib -lm -lpthread -lz
-DEFS           | defined | ?     | LINUX64 H5_USE_16_API _HAVE_MUMPS H5_PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS           | defined | ?     | LINUX64  _HAVE_MUMPS H5_PART_HAS_MPI _USE_MED_SHORT_INT
 #
 #
 NOBUILD        | option  | ?     | 
 #
 PYTHON         | python  | PYVER   | /usr/bin/pythonPYVER
 #
-LINK           | link    | ?     | /usr/bin/gfortran
+LINK           | link    | ?     | /usr/bin/gfortran-4.6
 OPTL           | link    | ?     | -fopenmp
 #
-CC             | cc      | ?     | /usr/bin/gcc
+CC             | cc      | ?     | /usr/bin/gcc-4.6
 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/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
+F77            | f77     | ?     | /usr/bin/gfortran-4.6
 OPTF_D         | f77     | ?     | -c -g  -fPIC  -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 OPTF_O         | f77     | ?     | -c -O2 -fno-tree-dse -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
 INCLF          | include | ?     | -I/usr/include/mpi
 #
-F90            | f90     | ?     | /usr/bin/gfortran
+F90            | f90     | ?     | /usr/bin/gfortran-4.6
 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/STA_VERSION/bibf90/include_mumps-4.9.2 -I/usr/include/mpi

Modified: packages/code-aster/aster/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/control?rev=45377&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/control (original)
+++ packages/code-aster/aster/trunk/debian/control Fri Oct  5 10:46:41 2012
@@ -4,13 +4,13 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Andrea Palazzi <palazziandrea at yahoo.it>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), quilt, gfortran (<< 4.7),
+Build-Depends: debhelper (>= 7), quilt, gfortran-4.6, gcc-4.6, 
  openssh-client, 
  liblapack-dev, libblas-dev, libhdf5-mpi-dev,
  libmed-dev (>= 3.0), libmedc-dev (>= 3.0),
  python-all-dev, python-support, python-numpy, code-aster-run (>= 1.8.1-2),
  code-aster-gui (>= 1.8.1-2),
- libmumps-seq-dev (<< 4.10), libmumps-ptscotch-dev (<< 4.10), 
+ libmumps-seq-dev, libmumps-ptscotch-dev, 
  libscotch-dev, libscotchmetis-dev, libptscotch-dev, libscalapack-mpi-dev,
  libblacs-mpi-dev, mpi-default-dev, libscotchparmetis-dev
 Homepage: http://www.code-aster.org/




More information about the debian-science-commits mailing list