[petsc] 02/03: update package build and alternatives links

Drew Parsons dparsons at moszumanska.debian.org
Thu Oct 8 18:53:22 UTC 2015


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

dparsons pushed a commit to branch master
in repository petsc.

commit c0a0b1b3e992f8f11a133ce1c10c1022ce4bd68f
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Oct 9 00:26:29 2015 +0800

    update package build and alternatives links
    
    Just set one preferred libpetsc.so using alternatives, which might be
    the real or the complex library (default: real).
    
    Use soname extensions to build actual libraries libpetsc_real.so and
    libpetsc_complex.so with distinct sonames.
---
 debian/libpetsc-complex-3.6.2-dev.postinst | 13 ++++++-------
 debian/libpetsc-complex-3.6.2-dev.prerm    |  3 +--
 debian/libpetsc-complex-3.6.postinst       |  4 ++--
 debian/libpetsc-complex-3.6.prerm          |  2 +-
 debian/libpetsc3.6.2-dbg.postinst          |  4 ++--
 debian/libpetsc3.6.2-dev.postinst          |  4 ++--
 debian/libpetsc3.6.postinst                |  4 ++--
 debian/libpetsc3.6.prerm                   |  2 +-
 debian/rules                               | 28 +++++++++++++++-------------
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/debian/libpetsc-complex-3.6.2-dev.postinst b/debian/libpetsc-complex-3.6.2-dev.postinst
index 49a5e0a..63d1d44 100644
--- a/debian/libpetsc-complex-3.6.2-dev.postinst
+++ b/debian/libpetsc-complex-3.6.2-dev.postinst
@@ -8,13 +8,12 @@ PETSC_COMPLEX_ARCH=${PETSC_ARCH}-complex
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
-update-alternatives --install /usr/lib/petsc-complex petsc-complex /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH} 3620 \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc-complex.so libpetsc-complex.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc-complex.so.${PETSC_VERSION} \
-  --slave /usr/include/petsc-complex petsc-complex-include /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/include \
-  --slave /usr/lib/pkgconfig/PETSc-complex.pc PETSc-complex.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/lib/pkgconfig/PETSc.pc \
-
-update-alternatives --install /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/share/petsc/matlab 3620
-
+update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH} 3620 \
+  --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/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/include \
+  --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/lib/pkgconfig/PETSc.pc \
+  --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/share/petsc/matlab
 fi
 
 
diff --git a/debian/libpetsc-complex-3.6.2-dev.prerm b/debian/libpetsc-complex-3.6.2-dev.prerm
index b8501fd..d459be2 100644
--- a/debian/libpetsc-complex-3.6.2-dev.prerm
+++ b/debian/libpetsc-complex-3.6.2-dev.prerm
@@ -8,8 +8,7 @@ PETSC_COMPLEX_ARCH=${PETSC_ARCH}-complex
 
 # Remove alternatives links
 if [ "$1" = "remove" ]; then
-  update-alternatives --remove petsc-complex /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}
-  update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}/share/petsc/matlab
+  update-alternatives --remove petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_COMPLEX_ARCH}
 fi
 
 #DEBHELPER#
diff --git a/debian/libpetsc-complex-3.6.postinst b/debian/libpetsc-complex-3.6.postinst
index 3a2da47..2ae44e7 100644
--- a/debian/libpetsc-complex-3.6.postinst
+++ b/debian/libpetsc-complex-3.6.postinst
@@ -9,8 +9,8 @@ SONAME=$( echo ${PETSC_VERSION} | awk 'BEGIN { FS="."}; {print $1"."$2 }' )
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
-  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} 3620 \
-    --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.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} 3620 \
+    --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION}
 fi
 
 
diff --git a/debian/libpetsc-complex-3.6.prerm b/debian/libpetsc-complex-3.6.prerm
index 9a1c807..6f1d03a 100644
--- a/debian/libpetsc-complex-3.6.prerm
+++ b/debian/libpetsc-complex-3.6.prerm
@@ -7,7 +7,7 @@ SONAME=$( echo ${PETSC_VERSION} | awk 'BEGIN { FS="."}; {print $1"."$2 }' )
 
 # Remove alternatives links
 if [ "$1" = "remove" ]; then
-  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.${PETSC_VERSION}
 fi
 
 #DEBHELPER#
diff --git a/debian/libpetsc3.6.2-dbg.postinst b/debian/libpetsc3.6.2-dbg.postinst
index cc58c2a..d761238 100644
--- a/debian/libpetsc3.6.2-dbg.postinst
+++ b/debian/libpetsc3.6.2-dbg.postinst
@@ -9,8 +9,8 @@ PETSC_DEBUG_ARCH=${PETSC_ARCH}-debug
 # Make alternatives links
 if [ "$1" = "configure" ]; then
 update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH} 362 \
-  --slave /usr/lib/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc.so.${PETSC_VERSION} \
-  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so.multiarch /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc.so.${PETSC_VERSION} \
+  --slave /usr/lib/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_real.so.${PETSC_VERSION} \
+  --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so.multiarch /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/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
diff --git a/debian/libpetsc3.6.2-dev.postinst b/debian/libpetsc3.6.2-dev.postinst
index be9d067..93e50f4 100644
--- a/debian/libpetsc3.6.2-dev.postinst
+++ b/debian/libpetsc3.6.2-dev.postinst
@@ -9,8 +9,8 @@ PETSC_REAL_ARCH=${PETSC_ARCH}-real
 # Make alternatives links
 if [ "$1" = "configure" ]; then
 update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH} 3622 \
-  --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/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/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}/include \
   --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_REAL_ARCH}/share/petsc/matlab
diff --git a/debian/libpetsc3.6.postinst b/debian/libpetsc3.6.postinst
index c56d239..cfb390c 100644
--- a/debian/libpetsc3.6.postinst
+++ b/debian/libpetsc3.6.postinst
@@ -9,8 +9,8 @@ SONAME=$( echo ${PETSC_VERSION} | awk 'BEGIN { FS="."}; {print $1"."$2 }' )
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
-  update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc-real.so.${PETSC_VERSION} 3622 \
-    --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc-real.so.${PETSC_VERSION}
+  update-alternatives --install /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${SONAME} libpetsc.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} 3622 \
+    --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so.${PETSC_VERSION} libpetsc.so.${PETSC_VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
 fi
 
 
diff --git a/debian/libpetsc3.6.prerm b/debian/libpetsc3.6.prerm
index 6fb676e..6f4174d 100644
--- a/debian/libpetsc3.6.prerm
+++ b/debian/libpetsc3.6.prerm
@@ -7,7 +7,7 @@ SONAME=$( echo ${PETSC_VERSION} | awk 'BEGIN { FS="."}; {print $1"."$2 }' )
 
 # 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.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION}
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 3f40b3b..f2d30fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,6 +116,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) --  \
           --with-debugging=1  \
+	  --shared-library-extension=_real \
           --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
           $(CONFIGURATION_OPTIONS)  \
           --prefix=$(PETSC_DIR_DEBUG_PREFIX)  \
@@ -125,6 +126,7 @@ override_dh_auto_configure:
             CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
 	dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
           --with-debugging=0  \
+	  --shared-library-extension=_real \
           --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
           $(CONFIGURATION_OPTIONS)  \
           --prefix=$(PETSC_DIR_PREFIX)  \
@@ -133,7 +135,8 @@ override_dh_auto_configure:
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
             CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
 	dh_auto_configure -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --  \
-          --with-debugging=0  --with-scalar-type=complex --shared-library-extension=_complex \
+          --with-debugging=0  \
+	  --with-scalar-type=complex --shared-library-extension=_complex \
           $(CONFIGURATION_OPTIONS)  \
           --prefix=$(PETSC_COMPLEX_DIR_PREFIX)  \
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR) \
@@ -176,20 +179,19 @@ override_dh_auto_install:
 
 
 override_dh_install:
-	mv $(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)/lib/libpetsc.so.$(PETSC_VERSION) $(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)/lib/libpetsc-real.so.$(PETSC_VERSION)
-	dh_install -p$(PETSC_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --exclude=*html  $(PETSC_DIR_PREFIX)/lib/libpetsc-real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install -p$(PETSC_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc-real.so.$(PETSC_VERSION)  usr
-	dh_link -p$(PETSC_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-real.so.$(PETSC_VERSION)  $(PETSC_DIR_PREFIX)/lib/libpetsc.so.$(PETSC_VERSION)
-	dh_link -p$(PETSC_VERSIONED_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-real.so.$(PETSC_SONAME_VERSION)
-	dh_link -p$(PETSC_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-real.so
+	dh_install -p$(PETSC_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --exclude=*html  $(PETSC_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_install -p$(PETSC_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_real.so.$(PETSC_VERSION)  usr
+	dh_link -p$(PETSC_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_VERSION)  $(PETSC_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)
+	dh_link -p$(PETSC_VERSIONED_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_SONAME_VERSION)
+	dh_link -p$(PETSC_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so
+	
 	dh_install -p$(PETSC_DEBUG_PACKAGE) --sourcedir $(PACKAGE_DEBUG_INSTALL_BASEDIR) --autodest --exclude=*html  usr
 	
-	mv $(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc.so.$(PETSC_VERSION) $(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc-complex.so.$(PETSC_VERSION)
-	dh_install -p$(PETSC_COMPLEX_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc-complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc-complex.so.$(PETSC_VERSION)  usr
-	dh_link -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-complex.so.$(PETSC_VERSION)  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc.so.$(PETSC_VERSION)
-	dh_link -p$(PETSC_COMPLEX_VERSIONED_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-complex.so.$(PETSC_SONAME_VERSION)
-	dh_link -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc-complex.so
+	dh_install -p$(PETSC_COMPLEX_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_install -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_complex.so.$(PETSC_VERSION)  usr
+	dh_link -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_VERSION)  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)
+	dh_link -p$(PETSC_COMPLEX_VERSIONED_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_SONAME_VERSION)
+	dh_link -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so
 
 
 override_dh_installdocs:

-- 
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