[petsc] 02/03: name debug directory *-real-debug

Drew Parsons dparsons at moszumanska.debian.org
Sun Oct 11 18:15:11 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 ddf10736768ff873ea0552ff8d3234979b87ac6d
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Oct 11 22:27:27 2015 +0800

    name debug directory *-real-debug
    
    Makes the standard (real) debug installation more consistent with the
    others:
     *-real
     *-complex
     *-complex-debug
---
 debian/libpetsc3.6.2-dbg.postinst | 2 +-
 debian/libpetsc3.6.2-dbg.prerm    | 2 +-
 debian/rules                      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/libpetsc3.6.2-dbg.postinst b/debian/libpetsc3.6.2-dbg.postinst
index 9748dd1..d879ffd 100644
--- a/debian/libpetsc3.6.2-dbg.postinst
+++ b/debian/libpetsc3.6.2-dbg.postinst
@@ -4,7 +4,7 @@ DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
 
 PETSC_VERSION=__PETSC_VERSION__
 PETSC_ARCH=${DEB_HOST_MULTIARCH}
-PETSC_DEBUG_ARCH=${PETSC_ARCH}-debug
+PETSC_DEBUG_ARCH=${PETSC_ARCH}-real-debug
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
diff --git a/debian/libpetsc3.6.2-dbg.prerm b/debian/libpetsc3.6.2-dbg.prerm
index 893d634..0c9f2a2 100644
--- a/debian/libpetsc3.6.2-dbg.prerm
+++ b/debian/libpetsc3.6.2-dbg.prerm
@@ -4,7 +4,7 @@ DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
 
 PETSC_VERSION=__PETSC_VERSION__
 PETSC_ARCH=${DEB_HOST_MULTIARCH}
-PETSC_DEBUG_ARCH=${PETSC_ARCH}-debug
+PETSC_DEBUG_ARCH=${PETSC_ARCH}-real-debug
 
 # Remove alternatives links
 if [ "$1" = "remove" ]; then
diff --git a/debian/rules b/debian/rules
index a5750b9..177454d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ export OMPI_MCA_orte_rsh_agent=/bin/false
 PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi)
 
 PETSC_BUILD_DIR=$(PETSC_ARCH)-real
-PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-debug
+PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-real-debug
 PETSC_COMPLEX_BUILD_DIR=$(PETSC_ARCH)-complex
 PETSC_COMPLEX_DEBUG_BUILD_DIR=$(PETSC_ARCH)-complex-debug
 
@@ -72,13 +72,13 @@ PETSC_COMPLEX_DEBUG_PACKAGE=lib$(PETSC_COMPLEX_NAME)-dbg
 # install into /usr/lib/petscdir rather than /usr/lib/petsc 
 # to allow /usr/lib/petsc to be configured by alternatives
 PETSC_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-real
-PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-debug
+PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-real-debug
 PETSC_COMPLEX_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-complex
 PETSC_COMPLEX_DEBUG_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-complex-debug
 
 PACKAGE_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real
 PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)
-PACKAGE_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-debug
+PACKAGE_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real-debug
 PACKAGE_DEBUG_INSTALL_DIR=$(PACKAGE_DEBUG_INSTALL_BASEDIR)/$(PETSC_DIR_DEBUG_PREFIX)
 PACKAGE_COMPLEX_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-complex
 PACKAGE_COMPLEX_INSTALL_DIR=$(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(PETSC_COMPLEX_DIR_PREFIX)

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