[petsc] 03/07: update package scripts
Drew Parsons
dparsons at moszumanska.debian.org
Wed Nov 1 18:34:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository petsc.
commit 8fa6cd1247c6cf09175d7ff946fc5c45f0f87f7e
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Nov 2 01:39:26 2017 +0800
update package scripts
- use libpetsc-real3.8
- no patch-specific (X.Y.Z) version, use alternatives only to select real or
complex, or to select minor (X.Y) version.
---
debian/changelog | 2 ++
debian/libpetsc-complex3.8-dbg.postinst | 11 ++++++-----
debian/libpetsc-complex3.8-dbg.prerm | 3 ++-
debian/libpetsc-complex3.8-dev.postinst | 10 ++++------
debian/libpetsc-complex3.8-dev.prerm | 9 ++++-----
debian/libpetsc-complex3.8.lintian-overrides | 16 +++++-----------
debian/libpetsc-complex3.8.postinst | 7 +------
debian/libpetsc-complex3.8.prerm | 3 +--
debian/libpetsc-complex3.8.shlibs | 2 +-
debian/libpetsc-real3.8-dbg.postinst | 12 ++++++------
debian/libpetsc-real3.8-dbg.prerm | 3 ++-
debian/libpetsc-real3.8-dev.overrides | 2 +-
debian/libpetsc-real3.8-dev.postinst | 11 ++++-------
debian/libpetsc-real3.8-dev.prerm | 8 ++++----
debian/libpetsc-real3.8.lintian-overrides | 14 +++++---------
debian/libpetsc-real3.8.postinst | 7 +------
debian/libpetsc-real3.8.prerm | 3 +--
debian/libpetsc-real3.8.shlibs | 2 +-
debian/petsc3.8-doc.doc-base | 12 ++++++------
debian/petsc3.8-doc.overrides | 2 +-
20 files changed, 58 insertions(+), 81 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 671205b..add4ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ petsc (3.8.0+dfsg1-1exp1) UNRELEASED; urgency=medium
example-src-dir.patch
install-dir.patch
configure-kfreebsd8.patch
+ * New package structure: drop patch-specific versions and alternatives
+ i.e. drop 3.8.0 specific packages, any 3.8.Z will satisfy petsc3.8
-- Drew Parsons <dparsons at debian.org> Thu, 19 Oct 2017 09:59:02 +0800
diff --git a/debian/libpetsc-complex3.8-dbg.postinst b/debian/libpetsc-complex3.8-dbg.postinst
index 7d6e0b1..b564d66 100644
--- a/debian/libpetsc-complex3.8-dbg.postinst
+++ b/debian/libpetsc-complex3.8-dbg.postinst
@@ -6,6 +6,7 @@ PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_DEBUG_ARCH=${PETSC_ARCH}-complex-debug
PETSC_VERSION_NUMBER=$( echo ${PETSC_VERSION} | sed "s/\.//g" )
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
# Make alternatives links
@@ -21,11 +22,11 @@ if update-alternatives --query petsc | grep libpetsc.so.multiarch > /dev/null ;
done
fi
-update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}33 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_complex.so.${PETSC_VERSION} \
- --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/include \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
- --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
+update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}33 \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_complex.so.${PETSC_SONAME_VERSION} \
+ --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/include \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
+ --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
fi
diff --git a/debian/libpetsc-complex3.8-dbg.prerm b/debian/libpetsc-complex3.8-dbg.prerm
index 5cbceef..427962d 100644
--- a/debian/libpetsc-complex3.8-dbg.prerm
+++ b/debian/libpetsc-complex3.8-dbg.prerm
@@ -5,10 +5,11 @@ DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_DEBUG_ARCH=${PETSC_ARCH}-complex-debug
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}
+ update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}
fi
#DEBHELPER#
diff --git a/debian/libpetsc-complex3.8-dev.postinst b/debian/libpetsc-complex3.8-dev.postinst
index e965749..4476879 100644
--- a/debian/libpetsc-complex3.8-dev.postinst
+++ b/debian/libpetsc-complex3.8-dev.postinst
@@ -8,8 +8,9 @@ PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_COMPLEX_ARCH=${PETSC_ARCH}-complex
PETSC_VERSION_NUMBER=$( echo ${PETSC_VERSION} | sed "s/\.//g" )
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
-PETSC_DIR_COMPLEX=/usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}
+PETSC_DIR_COMPLEX=/usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_COMPLEX_ARCH}
# Make alternatives links
if [ "$1" = "configure" ]; then
@@ -30,20 +31,17 @@ fi
# alternative default petsc (e.g. real or complex)
update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_COMPLEX} ${PETSC_VERSION_NUMBER}73 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_SONAME_VERSION} \
--slave /usr/include/petsc petscinclude ${PETSC_DIR_COMPLEX}/include \
--slave /usr/lib/${DEB_HOST_MULTIARCH}/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
+update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so libpetsc_complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_SONAME_VERSION} ${PETSC_VERSION_NUMBER}73
# alternative petsc for this X.Y soname (e.g. real or complex)
update-alternatives --install /usr/lib/petscdir/${SONAME} petsc${SONAME} ${PETSC_DIR_COMPLEX} ${PETSC_VERSION_NUMBER}73
-# alternative complex petsc for this X.Y soname
-update-alternatives --install /usr/lib/petscdir/${SONAME}-complex petsc${SONAME}-complex ${PETSC_DIR_COMPLEX} ${PETSC_VERSION_NUMBER}73
-
fi
diff --git a/debian/libpetsc-complex3.8-dev.prerm b/debian/libpetsc-complex3.8-dev.prerm
index 246174e..30f0fd6 100644
--- a/debian/libpetsc-complex3.8-dev.prerm
+++ b/debian/libpetsc-complex3.8-dev.prerm
@@ -7,16 +7,15 @@ SONAME=__PETSC_SONAME_VERSION__
PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_COMPLEX_ARCH=${PETSC_ARCH}-complex
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
-PETSC_DIR_COMPLEX=/usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}
+PETSC_DIR_COMPLEX=/usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_COMPLEX_ARCH}
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}
- update-alternatives --remove libpetsc_complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
-
+ update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_COMPLEX_ARCH}
+ update-alternatives --remove libpetsc_complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_SONAME_VERSION}
update-alternatives --remove petsc${SONAME} ${PETSC_DIR_COMPLEX}
- update-alternatives --remove petsc${SONAME}-complex ${PETSC_DIR_COMPLEX}
fi
#DEBHELPER#
diff --git a/debian/libpetsc-complex3.8.lintian-overrides b/debian/libpetsc-complex3.8.lintian-overrides
index d82809d..1df1596 100644
--- a/debian/libpetsc-complex3.8.lintian-overrides
+++ b/debian/libpetsc-complex3.8.lintian-overrides
@@ -1,14 +1,8 @@
-# libpetsc-complex-3.8 provides an alternative (libpetc.so.3.8) for libpetsc3.8
-libpetsc-complex-3.8.0: package-name-doesnt-match-sonames libpetsc3.8
-
# libpetsc.so.3.8 soname links are managed by alternatives (libpetc.so.3.8)
-libpetsc-complex-3.8.0: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc-complex.so.3.8.0 libpetsc.so.3.8
-
-# the libpetsc.so link is managed by alternatives in libpetsc-complex-3.8.0-dev (alternative petsc)
-libpetsc-complex-3.8.0: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc-complex.so.3.8.0 usr/lib/x86_64-linux-gnu/libpetsc.so
+libpetsc-complex3.8: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc-complex.so.3.8 libpetsc.so.3.8
-# libpetsc_complex.so is handled by alternatives in libpetsc-complex-3.8.0-dev
-libpetsc-complex-3.8.0: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc_complex.so.3.8.0 usr/lib/x86_64-linux-gnu/libpetsc_complex.so
+# the libpetsc.so link is managed by alternatives in libpetsc-complex3.8-dev (alternative petsc)
+libpetsc-complex3.8: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc-complex.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc.so
-# the symlink is provided by alternatives, since petsc allows parallel installation of patch versions for the same soname
-libpetsc-complex-3.8.0: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc_complex.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc_complex.so.3.8.0 libpetsc_complex.so.3.8
+# libpetsc_complex.so is handled by alternatives in libpetsc-complex3.8-dev
+libpetsc-complex3.8: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc_complex.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc_complex.so
diff --git a/debian/libpetsc-complex3.8.postinst b/debian/libpetsc-complex3.8.postinst
index 0a86038..8f9dc3b 100644
--- a/debian/libpetsc-complex3.8.postinst
+++ b/debian/libpetsc-complex3.8.postinst
@@ -9,12 +9,7 @@ SONAME=__PETSC_SONAME_VERSION__
# Make alternatives links
if [ "$1" = "configure" ]; then
# alternative petsc version (for given soname), real or complex
- update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}73 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
-
- # alternative complex version (for given soname)
- update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${SONAME} libpetsc_complex.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}73
+ update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${SONAME} ${PETSC_VERSION_NUMBER}73
fi
-
#DEBHELPER#
diff --git a/debian/libpetsc-complex3.8.prerm b/debian/libpetsc-complex3.8.prerm
index 33b393d..92e00fa 100644
--- a/debian/libpetsc-complex3.8.prerm
+++ b/debian/libpetsc-complex3.8.prerm
@@ -6,8 +6,7 @@ SONAME=__PETSC_SONAME_VERSION__
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
- update-alternatives --remove libpetsc_complex.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
+ update-alternatives --remove libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${SONAME}
fi
#DEBHELPER#
diff --git a/debian/libpetsc-complex3.8.shlibs b/debian/libpetsc-complex3.8.shlibs
index 0e46691..0a8a8fe 100644
--- a/debian/libpetsc-complex3.8.shlibs
+++ b/debian/libpetsc-complex3.8.shlibs
@@ -1 +1 @@
-libpetsc_complex 3.8 libpetsc-complex-3.8
+libpetsc_complex 3.8 libpetsc-complex3.8
diff --git a/debian/libpetsc-real3.8-dbg.postinst b/debian/libpetsc-real3.8-dbg.postinst
index b5a9535..72a5385 100644
--- a/debian/libpetsc-real3.8-dbg.postinst
+++ b/debian/libpetsc-real3.8-dbg.postinst
@@ -6,6 +6,7 @@ PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_DEBUG_ARCH=${PETSC_ARCH}-real-debug
PETSC_VERSION_NUMBER=$( echo ${PETSC_VERSION} | sed "s/\.//g" )
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
# Make alternatives links
@@ -21,13 +22,12 @@ if update-alternatives --query petsc | grep libpetsc.so.multiarch > /dev/null ;
done
fi
-update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}37 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_real.so.${PETSC_VERSION} \
- --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/include \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
- --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
+update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}37 \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_real.so.${PETSC_SONAME_VERSION} \
+ --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/include \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
+ --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
fi
-
#DEBHELPER#
diff --git a/debian/libpetsc-real3.8-dbg.prerm b/debian/libpetsc-real3.8-dbg.prerm
index 0c9f2a2..a690df3 100644
--- a/debian/libpetsc-real3.8-dbg.prerm
+++ b/debian/libpetsc-real3.8-dbg.prerm
@@ -5,10 +5,11 @@ DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_DEBUG_ARCH=${PETSC_ARCH}-real-debug
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}
+ update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_DEBUG_ARCH}
fi
#DEBHELPER#
diff --git a/debian/libpetsc-real3.8-dev.overrides b/debian/libpetsc-real3.8-dev.overrides
index 6413f87..1938c5f 100644
--- a/debian/libpetsc-real3.8-dev.overrides
+++ b/debian/libpetsc-real3.8-dev.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-libpetsc3.8.0-dev: copyright-without-copyright-notice
+libpetsc-real3.8-dev: copyright-without-copyright-notice
diff --git a/debian/libpetsc-real3.8-dev.postinst b/debian/libpetsc-real3.8-dev.postinst
index 7c68cf4..e574681 100644
--- a/debian/libpetsc-real3.8-dev.postinst
+++ b/debian/libpetsc-real3.8-dev.postinst
@@ -8,8 +8,9 @@ PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_REAL_ARCH=${PETSC_ARCH}-real
PETSC_VERSION_NUMBER=$( echo ${PETSC_VERSION} | sed "s/\.//g" )
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
-PETSC_DIR_REAL=/usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}
+PETSC_DIR_REAL=/usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_REAL_ARCH}
# Make alternatives links
if [ "$1" = "configure" ]; then
@@ -29,21 +30,17 @@ fi
# alternative default petsc (e.g. real or complex)
update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_REAL} ${PETSC_VERSION_NUMBER}77 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
+ --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_SONAME_VERSION} \
--slave /usr/include/petsc petscinclude ${PETSC_DIR_REAL}/include \
--slave /usr/lib/${DEB_HOST_MULTIARCH}/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
+update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so libpetsc_real.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_SONAME_VERSION} ${PETSC_VERSION_NUMBER}77
# alternative petsc for this X.Y soname (e.g. real or complex)
update-alternatives --install /usr/lib/petscdir/${SONAME} petsc${SONAME} ${PETSC_DIR_REAL} ${PETSC_VERSION_NUMBER}77
-# alternative real petsc for this X.Y soname
-update-alternatives --install /usr/lib/petscdir/${SONAME}-real petsc${SONAME}-real ${PETSC_DIR_REAL} ${PETSC_VERSION_NUMBER}77
-
-
fi
diff --git a/debian/libpetsc-real3.8-dev.prerm b/debian/libpetsc-real3.8-dev.prerm
index 4380924..8ee9a00 100644
--- a/debian/libpetsc-real3.8-dev.prerm
+++ b/debian/libpetsc-real3.8-dev.prerm
@@ -7,17 +7,17 @@ SONAME=__PETSC_SONAME_VERSION__
PETSC_VERSION=__PETSC_VERSION__
PETSC_ARCH=${DEB_HOST_MULTIARCH}
PETSC_REAL_ARCH=${PETSC_ARCH}-real
+PETSC_SONAME_VERSION=__PETSC_SONAME_VERSION__
-PETSC_DIR_REAL=/usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}
+PETSC_DIR_REAL=/usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_REAL_ARCH}
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}
- update-alternatives --remove libpetsc_real.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
+ update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_SONAME_VERSION}/${PETSC_REAL_ARCH}
+ update-alternatives --remove libpetsc_real.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_SONAME_VERSION}
# remove general X.Y soname alternatives
update-alternatives --remove petsc${SONAME} ${PETSC_DIR_REAL}
- update-alternatives --remove petsc${SONAME}-real ${PETSC_DIR_REAL}
fi
diff --git a/debian/libpetsc-real3.8.lintian-overrides b/debian/libpetsc-real3.8.lintian-overrides
index e2eb751..7a7e814 100644
--- a/debian/libpetsc-real3.8.lintian-overrides
+++ b/debian/libpetsc-real3.8.lintian-overrides
@@ -1,12 +1,8 @@
# libpetsc.so.3.8 soname links are managed by alternatives (libpetc.so.3.8)
-libpetsc3.8.0: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc-real.so.3.8.0 libpetsc.so.3.8
+libpetsc-real3.8: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc-real.so.3.8 libpetsc.so.3.8
-# the libpetsc.so link is managed by alternatives in libpetsc3.8.0-dev (alternative petsc)
-libpetsc3.8.0: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc-real.so.3.8.0 usr/lib/x86_64-linux-gnu/libpetsc.so
-
-# libpetsc_real.so is handled by alternatives in libpetsc3.8.0-dev
-libpetsc3.8.0: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc_real.so.3.8.0 usr/lib/x86_64-linux-gnu/libpetsc_real.so
-
-# the symlink is provided by alternatives, since petsc allows parallel installation of patch versions for the same soname
-libpetsc3.8.0: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libpetsc_real.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc_real.so.3.8.0 libpetsc_real.so.3.8
+# the libpetsc.so link is managed by alternatives in libpetsc-real3.8-dev (alternative petsc)
+libpetsc-real3.8: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc-real.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc.so
+# libpetsc_real.so is handled by alternatives in libpetsc-real3.8-dev
+libpetsc-real3.8: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpetsc_real.so.3.8 usr/lib/x86_64-linux-gnu/libpetsc_real.so
diff --git a/debian/libpetsc-real3.8.postinst b/debian/libpetsc-real3.8.postinst
index 1c6fc30..4cc82b9 100644
--- a/debian/libpetsc-real3.8.postinst
+++ b/debian/libpetsc-real3.8.postinst
@@ -9,12 +9,7 @@ SONAME=__PETSC_SONAME_VERSION__
# Make alternatives links
if [ "$1" = "configure" ]; then
# alternative petsc version (for given soname), real or complex
- update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}77 \
- --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
-
- # alternative real version (for given soname)
- update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${SONAME} libpetsc_real.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} ${PETSC_VERSION_NUMBER}77
+ update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${SONAME} ${PETSC_VERSION_NUMBER}77
fi
-
#DEBHELPER#
diff --git a/debian/libpetsc-real3.8.prerm b/debian/libpetsc-real3.8.prerm
index c572a3b..f3f1f08 100644
--- a/debian/libpetsc-real3.8.prerm
+++ b/debian/libpetsc-real3.8.prerm
@@ -6,8 +6,7 @@ SONAME=__PETSC_SONAME_VERSION__
# Remove alternatives links
if [ "$1" = "remove" ]; then
- update-alternatives --remove libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
- update-alternatives --remove libpetsc_real.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
+ update-alternatives --remove libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${SONAME}
fi
#DEBHELPER#
diff --git a/debian/libpetsc-real3.8.shlibs b/debian/libpetsc-real3.8.shlibs
index ad1c509..5216894 100644
--- a/debian/libpetsc-real3.8.shlibs
+++ b/debian/libpetsc-real3.8.shlibs
@@ -1 +1 @@
-libpetsc_real 3.8 libpetsc3.8
+libpetsc_real 3.8 libpetsc-real3.8
diff --git a/debian/petsc3.8-doc.doc-base b/debian/petsc3.8-doc.doc-base
index 4e463fb..167c8d3 100644
--- a/debian/petsc3.8-doc.doc-base
+++ b/debian/petsc3.8-doc.doc-base
@@ -1,5 +1,5 @@
-Document: petsc3.8.0-doc
-Title: PETSc 3.8.0 Documentation
+Document: petsc3.8-doc
+Title: PETSc 3.8 Documentation
Author: Satish Balay, William D. Gropp, Lois Curfman McInnes, Barry F. Smith
Abstract: PETSc is a suite of data structures and routines for the scalable
(parallel) solution of scientific applications modeled by partial differential
@@ -9,7 +9,7 @@ Abstract: PETSc is a suite of data structures and routines for the scalable
Section: Programming
Format: HTML
-Index: /usr/share/doc/petsc3.8.0-doc/docs/index.html
-Files: /usr/share/doc/petsc3.8.0-doc/docs/*.html
- /usr/share/doc/petsc3.8.0-doc/docs/*/*.html
- /usr/share/doc/petsc3.8.0-doc/docs/*/*/*.html
+Index: /usr/share/doc/petsc3.8-doc/docs/index.html
+Files: /usr/share/doc/petsc3.8-doc/docs/*.html
+ /usr/share/doc/petsc3.8-doc/docs/*/*.html
+ /usr/share/doc/petsc3.8-doc/docs/*/*/*.html
diff --git a/debian/petsc3.8-doc.overrides b/debian/petsc3.8-doc.overrides
index 3cb9137..8607a77 100644
--- a/debian/petsc3.8-doc.overrides
+++ b/debian/petsc3.8-doc.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-petsc3.8.0-doc: copyright-without-copyright-notice
+petsc3.8-doc: copyright-without-copyright-notice
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git
More information about the debian-science-commits
mailing list