[petsc] 01/02: remove dependencies on libblacs-mpi-dev

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit e9a6bac0d4f850b3875cc1f080387476ac8be02c
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Jul 27 15:34:14 2017 +0800

    remove dependencies on libblacs-mpi-dev
    
    blacs is now included in scalapack 2.0
---
 debian/changelog | 2 ++
 debian/control   | 6 +++---
 debian/rules     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75948c4..685c9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ petsc (3.7.6+dfsg1-3) UNRELEASED; urgency=medium
     minor, not patch (release) version in include/petscsys.h. Should
     simplify future openmpi upgrades, see debian/extract_MPI_dependency.
     Taken from upstream git (commits ca70f86, 41f4af4). Closes: #865526.
+  * blacs is now included in scalapack 2.0, so remove dependencies on
+    libblacs-mpi-dev.
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 21 Jul 2017 00:24:00 +0800
 
diff --git a/debian/control b/debian/control
index 46110b5..587907e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 10), quilt, python (>= 2.2), gfortran,
  libsuitesparse-dev (>= 1:4.2.1),
  libspooles-dev (>= 2.2-6), libhypre-dev (>= 2.11.1-3), libptscotch-dev,
  libhdf5-mpi-dev (>= 1.8.8),
- libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev,
+ libscalapack-mpi-dev (>= 2.0.2), libmumps-dev,
  libfftw3-dev, libfftw3-mpi-dev, libssl-dev,
  libsuperlu-dev (>= 5.2)
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/petsc.git
@@ -43,7 +43,7 @@ Multi-Arch: same
 Architecture: any
 Section: libdevel
 Depends: libpetsc3.7.6 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
- libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
+ libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libscalapack-mpi-dev (>= 2.0.2),
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, gfortran,
  libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
  ${misc:Depends}, ${python:Depends}
@@ -165,7 +165,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libpetsc-complex-3.7.6 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
- libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
+ libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libscalapack-mpi-dev (>= 2.0.2),
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, gfortran,
  libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
  ${misc:Depends}, ${python:Depends}
diff --git a/debian/rules b/debian/rules
index 5457139..f7800e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ CONFIGURATION_OPTIONS=--with-shared-libraries --with-pic=1 \
 	  --with-fortran-interfaces=1 \
 	  --with-mpi-dir=$(PETSC_MPI_DIR) \
 	  --with-blas-lib=-lblas --with-lapack-lib=-llapack \
-	  --with-blacs=1 --with-blacs-lib="-lblacsCinit-$(PETSC_MPI) -lblacs-$(PETSC_MPI)" \
+	  --with-blacs=1 --with-blacs-lib=-lscalapack-$(PETSC_MPI) \
 	  --with-scalapack=1 --with-scalapack-lib=-lscalapack-$(PETSC_MPI) \
 	  --with-mumps=1 --with-mumps-include=[] --with-mumps-lib="-ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord" \
 	  --with-suitesparse=1 --with-suitesparse-include=/usr/include/suitesparse --with-suitesparse-lib="-lumfpack -lamd -lcholmod -lklu" \

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