[petsc] 02/05: Reinstate support for superlu (>=5.2)

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag debian/3.7.3.dfsg1-3
in repository petsc.

commit 29ec84c4fda95fd66d232772bb4e0612872481c8
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Sep 3 15:18:46 2016 +0800

    Reinstate support for superlu (>=5.2)
---
 debian/changelog |  3 ++-
 debian/control   | 10 +++++-----
 debian/rules     |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddae608..f6e0c88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 petsc (3.7.3.dfsg1-3) UNRELEASED; urgency=medium
 
-  * Reinstate build on kfreebsd (it now passes built-time tests).
+  * Reinstate build on kfreebsd (it now passes build-time tests).
+  * Reinstate support for superlu (>=5.2).
 
  -- Drew Parsons <dparsons at debian.org>  Sun, 28 Aug 2016 18:06:03 +0800
 
diff --git a/debian/control b/debian/control
index 62a98a0..fb50d1d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), quilt, python (>= 2.2), gfortran,
  libhdf5-mpi-dev (>= 1.8.8),
  libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev,
  libfftw3-dev, libfftw3-mpi-dev, libssl-dev,
- libsuperlu-dev (<< 5.2)
+ libsuperlu-dev (>= 5.2)
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/petsc.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/petsc.git
 Homepage: http://www.mcs.anl.gov/petsc
@@ -42,13 +42,13 @@ Package: libpetsc3.7.3-dev
 Multi-Arch: same
 Architecture: any
 Section: libdevel
-Depends: libpetsc3.7.3 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libsuperlu-dev, libspooles-dev,
+Depends: libpetsc3.7.3 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
  libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, libgfortran-5-dev,
  ${misc:Depends}, ${python:Depends}
 Conflicts: libpetsc3.6.3-dev (<< 3.6.3.dfsg2-2), libpetsc-complex-3.6.3-dev (<< 3.6.3.dfsg2-2),
  libpetsc3.6.2-dev (<= 3.6.2.dfsg1-3), libpetsc-complex-3.6.2-dev (<= 3.6.2.dfsg1-3)
-Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (<< 5.2),
+Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
  tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
 Suggests: petsc-dev (= ${binary:Version}), libpetsc3.7.3-dbg (= ${binary:Version}), petsc3.7.3-doc (= ${binary:Version}), libluminate-dev
 Description: Static libraries, shared links, header files for PETSc
@@ -162,13 +162,13 @@ Package: libpetsc-complex-3.7.3-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libpetsc-complex-3.7.3 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libsuperlu-dev, libspooles-dev,
+Depends: libpetsc-complex-3.7.3 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
  libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, libgfortran-5-dev,
  ${misc:Depends}, ${python:Depends}
 Conflicts: libpetsc-complex-3.6.3-dev (<< 3.6.3.dfsg2-2), libpetsc3.6.3-dev (<< 3.6.3.dfsg2-2),
  libpetsc3.6.2-dev (<= 3.6.2.dfsg1-3), libpetsc-complex-3.6.2-dev (<= 3.6.2.dfsg1-3)
-Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (<< 5.2),
+Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
  tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
 Suggests: petsc-dev (= ${binary:Version}), libpetsc-complex-3.7.3-dbg (= ${binary:Version}), petsc3.7.3-doc (= ${binary:Version}), libluminate-dev
 Description: Static libraries, shared links, header files for PETSc
diff --git a/debian/rules b/debian/rules
index ddf2867..5342da4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ CONFIGURATION_OPTIONS=--with-shared-libraries --with-pic=1 \
 	  --with-spooles=1 --with-spooles-include=/usr/include/spooles --with-spooles-lib=-lspooles \
 	  --with-ptscotch=1 --with-ptscotch-include=/usr/include/scotch --with-ptscotch-lib="-lptesmumps -lptscotch -lptscotcherr" \
 	  --with-fftw=1 --with-fftw-include=[] --with-fftw-lib="-lfftw3 -lfftw3_mpi" \
-	  --with-superlu=0 \
+	  --with-superlu=1 --with-superlu-include=/usr/include/superlu --with-superlu-lib=-lsuperlu \
 	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed"
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git