[petsc] 05/06: libpetsc3.6.3 conflicts/replaces old libpetsc3.6

[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 b96048bb772f79596a3829131825a32820c00a78
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Mar 31 09:20:25 2016 +0800

    libpetsc3.6.3 conflicts/replaces old libpetsc3.6
    
    The library package with patch version (e.g. libpetsc3.6.2) was
    previously changed to a library package without the patch version
    (libpetsc3.6) since the patch version is not in the library's soname.
    
    But the PETSc installation enables different patch versions to be
    installed.  The latest packaging therefore restores libraries with
    patch version and handles libpetsc.3.6.so using alternatives. (The
    general dev package then is libpetsc3.6-dev)
    
    The former libpetsc3.6 package did not have the alternatives mechanism
    in place for handling /usr/lib/x86_64-linux-gnu/libpetsc_real.so.3.6,
    therefore we need to manage the upgrade using conflicts/replaces.
    
    Likewise for libpetsc-complex-3.6.3 against libpetsc-complex-3.6
---
 debian/control                             | 4 ++++
 debian/libpetsc-complex-3.6.3-dev.postinst | 6 +-----
 debian/libpetsc3.6.3-dev.postinst          | 6 +-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 4444fd1..72e3f0c 100644
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,8 @@ Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libpetsc3.6 (<< 3.6.2.dfsg1-4)
+Replaces: libpetsc3.6 (<< 3.6.2.dfsg1-4)
 Description: Shared libraries for version 3.6 of PETSc
  PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
  of data structures and routines for the scalable (parallel) solution of
@@ -184,6 +186,8 @@ Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libpetsc-complex-3.6 (<< 3.6.2.dfsg1-4)
+Replaces: libpetsc-complex-3.6 (<< 3.6.2.dfsg1-4)
 Description: Shared libraries for version 3.6 of PETSc with Complex Numbers
  PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
  of data structures and routines for the scalable (parallel) solution of
diff --git a/debian/libpetsc-complex-3.6.3-dev.postinst b/debian/libpetsc-complex-3.6.3-dev.postinst
index 53dc8fd..80285bf 100644
--- a/debian/libpetsc-complex-3.6.3-dev.postinst
+++ b/debian/libpetsc-complex-3.6.3-dev.postinst
@@ -16,16 +16,12 @@ if [ "$1" = "configure" ]; then
 update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_COMPLEX} ${PETSC_VERSION_NUMBER}73 \
   --slave /usr/lib/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so.multiarch /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude ${PETSC_DIR_COMPLEX}/include \
   --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_COMPLEX}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave ${PETSC_DIR_COMPLEX}/share/petsc/matlab
 
 # alternative base version of petsc complex
-update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so libpetsc_complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}73 \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${SONAME} libpetsc_complex.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} libpetsc_complex.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
+update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so libpetsc_complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}73
 
 fi
 
diff --git a/debian/libpetsc3.6.3-dev.postinst b/debian/libpetsc3.6.3-dev.postinst
index 12c28fc..0a0372a 100644
--- a/debian/libpetsc3.6.3-dev.postinst
+++ b/debian/libpetsc3.6.3-dev.postinst
@@ -16,16 +16,12 @@ if [ "$1" = "configure" ]; then
 update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_REAL} ${PETSC_VERSION_NUMBER}77 \
   --slave /usr/lib/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so.multiarch /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude ${PETSC_DIR_REAL}/include \
   --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_REAL}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave ${PETSC_DIR_REAL}/share/petsc/matlab
 
 # alternative base version of petsc real
-update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so libpetsc_real.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}77 \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${SONAME} libpetsc_real.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} libpetsc_real.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
+update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so libpetsc_real.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}77
 
 fi
 

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