[slepc] 01/01: dev packages depend on specific patch versions of PETSc

Drew Parsons dparsons at moszumanska.debian.org
Mon Jan 16 06:37:45 UTC 2017


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

dparsons pushed a commit to branch master
in repository slepc.

commit 4ea8df863006841b24999308200eb0337dcf65c9
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Jan 16 14:35:17 2017 +0800

    dev packages depend on specific patch versions of PETSc
    
    patch-specific SLEPc dev packages depend on specific patch versions
    of PETSc, see SLEPc.pc and PETSc.pc.
    
    So the petsc dev dependencies need to be tightened to the specific
    patch version.
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7a172d..baf64d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+slepc (3.7.3+dfsg1-4) UNRELEASED; urgency=medium
+
+  * patch-specific SLEPc dev packages depend on specific patch versions
+    of PETSc, see SLEPc.pc and PETSc.pc.
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 16 Jan 2017 14:31:41 +0800
+
 slepc (3.7.3+dfsg1-3) unstable; urgency=medium
 
   * link header docs to the actual header files
diff --git a/debian/control b/debian/control
index 056e244..2a584a6 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: Scalable Library for Eigenvalue Problem Computations
 Package: libslepc3.7.3-dev
 Section: libdevel
 Architecture: any
-Depends: libslepc3.7.3 (= ${binary:Version}), libpetsc3.7-dev,
+Depends: libslepc3.7.3 (= ${binary:Version}), ${petsc:dev},
  libarpack2-dev, libparpack2-dev, libhdf5-mpi-dev,
  ${misc:Depends}, ${python:Depends}
 Suggests: slepc3.7.3-doc (= ${binary:Version})
@@ -106,7 +106,7 @@ Description: Scalable Library for Eigenvalue Problem Computations
 Package: libslepc-complex-3.7.3-dev
 Section: libdevel
 Architecture: any
-Depends: libslepc-complex-3.7.3 (= ${binary:Version}), libpetsc-complex-3.7-dev,
+Depends: libslepc-complex-3.7.3 (= ${binary:Version}), ${petsc:complex-dev},
  libarpack2-dev, libparpack2-dev, libhdf5-mpi-dev,
  ${misc:Depends}, ${python:Depends}
 Suggests: slepc3.7.3-doc (= ${binary:Version})
diff --git a/debian/rules b/debian/rules
index 5c724bc..ca40eff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ PETSC_SONAME_VERSION=$(SLEPC_SONAME_VERSION)
 PETSC_DIR=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)
 PETSC_DIR_REAL=$(PETSC_DIR)-real
 PETSC_DIR_COMPLEX=$(PETSC_DIR)-complex
+PETSC_VERSION=$(shell pkg-config --modversion PETSc)
 
 export SLEPC_DIR=$(CURDIR)
 
@@ -196,11 +197,13 @@ override_dh_installdeb:
 	  sed -i -e 's/__SLEPC_SONAME_VERSION__/$(SLEPC_SONAME_VERSION)/; s/__SLEPC_VERSION__/$(SLEPC_VERSION)/; s/__DEB_HOST_MULTIARCH__/$(DEB_HOST_MULTIARCH)/' debian/$$pkg/DEBIAN/*; \
 	done
 
-
 override_dh_strip:
 	dh_strip -p$(SLEPC_VERSIONED_PACKAGE)
 	dh_strip -p$(SLEPC_COMPLEX_VERSIONED_PACKAGE)
 
+override_dh_gencontrol:
+	# SLEPc.pc depends on specific patch version of PETSc (as defined in PETSc.pc)
+        dh_gencontrol -- -Vpetsc:dev="libpetsc$(PETSC_VERSION)-dev" -Vpetsc:complex-dev="libpetsc-complex-$(PETSC_VERSION)-dev"
 
 DEB_SOURCE_PACKAGE = slepc
 DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')

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



More information about the debian-science-commits mailing list