[slepc] 12/16: update debian/rules
Drew Parsons
dparsons at moszumanska.debian.org
Mon Nov 6 06:33:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository slepc.
commit a0bd065f8b4e235fb0edb37b3d07f81936111abe
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Nov 6 12:37:31 2017 +0800
update debian/rules
use explicit _REAL_ references,
no longer building _VERSIONED_ packages
---
debian/libslepc-complex3.8-dev.links | 2 +-
debian/rules | 66 +++++++++++++++++-------------------
2 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/debian/libslepc-complex3.8-dev.links b/debian/libslepc-complex3.8-dev.links
index 6efce60..1a1ecfa 100755
--- a/debian/libslepc-complex3.8-dev.links
+++ b/debian/libslepc-complex3.8-dev.links
@@ -1,2 +1,2 @@
#! /bin/sh
-echo usr/lib/${DEB_HOST_MULTIARCH}/libslepc_complex.so.${SLEPC_VERSION} ${SLEPC_REAL_DIR_PREFIX}/lib/libslepc_complex.so.${SLEPC_VERSION}
+echo usr/lib/${DEB_HOST_MULTIARCH}/libslepc_complex.so.${SLEPC_VERSION} ${SLEPC_COMPLEX_DIR_PREFIX}/lib/libslepc_complex.so.${SLEPC_VERSION}
diff --git a/debian/rules b/debian/rules
index 4400c89..b7d2954 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,26 +53,24 @@ export SLEPC_VERSION=3.8.1$(SLEPC_EXT)
export SLEPC_SONAME_VERSION=$(shell echo $(SLEPC_VERSION) | awk 'BEGIN { FS="."}; {print $$1"."$$2 }')
# SLEPC_NAME is the install dir under /usr/lib and the base for package names
-SLEPC_SONAME=slepc$(SLEPC_SONAME_VERSION)
-SLEPC_NAME=slepc$(SLEPC_VERSION)
-SLEPC_COMPLEX_SONAME=slepc-complex-$(SLEPC_SONAME_VERSION)
-SLEPC_COMPLEX_NAME=slepc-complex-$(SLEPC_VERSION)
+SLEPC_NAME=slepc$(SLEPC_SONAME_VERSION)
+SLEPC_REAL_NAME=slepc-real$(SLEPC_SONAME_VERSION)
+SLEPC_COMPLEX_NAME=slepc-complex$(SLEPC_SONAME_VERSION)
# debian binary package names
-SLEPC_DEV_PACKAGE=$(SLEPC_NAME)-dev
-SLEPC_VERSIONED_DEV_PACKAGE=lib$(SLEPC_NAME)-dev
-SLEPC_VERSIONED_PACKAGE=lib$(SLEPC_NAME)
+SLEPC_REAL_DEV_PACKAGE=lib$(SLEPC_REAL_NAME)-dev
+SLEPC_REAL_PACKAGE=lib$(SLEPC_REAL_NAME)
SLEPC_DOC_PACKAGE=$(SLEPC_NAME)-doc
-SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE=lib$(SLEPC_COMPLEX_NAME)-dev
-SLEPC_COMPLEX_VERSIONED_PACKAGE=lib$(SLEPC_COMPLEX_NAME)
+SLEPC_COMPLEX_DEV_PACKAGE=lib$(SLEPC_COMPLEX_NAME)-dev
+SLEPC_COMPLEX_PACKAGE=lib$(SLEPC_COMPLEX_NAME)
# install into /usr/lib/slepcdir rather than /usr/lib/slepc
# to allow /usr/lib/slepc to be configured by alternatives
-SLEPC_DIR_PREFIX=/usr/lib/slepcdir/$(SLEPC_VERSION)/$(SLEPC_ARCH)-real
-SLEPC_COMPLEX_DIR_PREFIX=/usr/lib/slepcdir/$(SLEPC_VERSION)/$(SLEPC_ARCH)-complex
+export SLEPC_REAL_DIR_PREFIX=/usr/lib/slepcdir/$(SLEPC_NAME)/$(SLEPC_ARCH)-real
+export SLEPC_COMPLEX_DIR_PREFIX=/usr/lib/slepcdir/$(SLEPC_NAME)/$(SLEPC_ARCH)-complex
-PACKAGE_INSTALL_BASEDIR=debian/tmp/$(SLEPC_NAME)-real
-PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_BASEDIR)/$(SLEPC_DIR_PREFIX)
+PACKAGE_REAL_INSTALL_BASEDIR=debian/tmp/$(SLEPC_NAME)-real
+PACKAGE_REAL_INSTALL_DIR=$(PACKAGE_REAL_INSTALL_BASEDIR)/$(SLEPC_REAL_DIR_PREFIX)
PACKAGE_COMPLEX_INSTALL_BASEDIR=debian/tmp/$(SLEPC_NAME)-complex
PACKAGE_COMPLEX_INSTALL_DIR=$(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(SLEPC_COMPLEX_DIR_PREFIX)
@@ -91,11 +89,11 @@ export SLEPC_DIR=$(CURDIR)
override_dh_auto_clean:
if [ -d $(SLEPC_BUILD_DIR) ]; then \
- dh_auto_clean -p$(SLEPC_VERSIONED_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) -- \
+ dh_auto_clean -p$(SLEPC_REAL_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) -- \
SLEPC_DIR=$(CURDIR) SLEPC_ARCH=$(SLEPC_BUILD_DIR); \
fi
if [ -d $(SLEPC_COMPLEX_BUILD_DIR) ]; then \
- dh_auto_clean -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) -- \
+ dh_auto_clean -p$(SLEPC_COMPLEX_DEV_PACKAGE) -- \
SLEPC_DIR=$(CURDIR) SLEPC_ARCH=$(SLEPC_COMPLEX_BUILD_DIR); \
fi
@@ -127,27 +125,27 @@ override_dh_auto_test:
override_dh_auto_install:
PETSC_DIR=$(PETSC_DIR_REAL) \
- ./configure --prefix=$(SLEPC_DIR_PREFIX) \
+ ./configure --prefix=$(SLEPC_REAL_DIR_PREFIX) \
--with-arpack=1 \
--shared-library-extension=_real
- dh_auto_build -p$(SLEPC_VERSIONED_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) -- \
+ dh_auto_build -p$(SLEPC_REAL_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) -- \
-j 1 PETSC_DIR=$(PETSC_DIR_REAL)
- dh_auto_install -p$(SLEPC_VERSIONED_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) \
- --destdir=$(PACKAGE_INSTALL_DIR) -- \
- SLEPC_INSTALLDIR=$(SLEPC_DIR_PREFIX) \
- SLEPC_DESTDIR=$(PACKAGE_INSTALL_DIR) \
+ dh_auto_install -p$(SLEPC_REAL_DEV_PACKAGE) -p$(SLEPC_DOC_PACKAGE) \
+ --destdir=$(PACKAGE_REAL_INSTALL_DIR) -- \
+ SLEPC_INSTALLDIR=$(SLEPC_REAL_DIR_PREFIX) \
+ SLEPC_DESTDIR=$(PACKAGE_REAL_INSTALL_DIR) \
PETSC_DIR=$(PETSC_DIR_REAL)
- echo PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_DIR)
- echo SLEPC_DIR_PREFIX=$(SLEPC_DIR_PREFIX)
+ echo PACKAGE_INSTALL_DIR=$(PACKAGE_REAL_INSTALL_DIR)
+ echo SLEPC_DIR_PREFIX=$(SLEPC_REAL_DIR_PREFIX)
# make SLEPC_DIR=$(CURDIR)/$(PACKAGE_INSTALL_DIR) PETSC_DIR=$(PETSC_DIR_REAL) PETSC_ARCH="" LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PACKAGE_INSTALL_DIR)/lib test
PETSC_DIR=$(PETSC_DIR_COMPLEX) \
./configure --prefix=$(SLEPC_COMPLEX_DIR_PREFIX) \
--with-arpack=1 \
--shared-library-extension=_complex
- dh_auto_build -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) -- \
+ dh_auto_build -p$(SLEPC_COMPLEX_DEV_PACKAGE) -- \
-j 1 PETSC_DIR=$(PETSC_DIR_COMPLEX)
- dh_auto_install -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_COMPLEX_INSTALL_DIR) -- \
+ dh_auto_install -p$(SLEPC_COMPLEX_DEV_PACKAGE) --destdir=$(PACKAGE_COMPLEX_INSTALL_DIR) -- \
SLEPC_INSTALLDIR=$(SLEPC_COMPLEX_DIR_PREFIX) \
SLEPC_DESTDIR=$(PACKAGE_COMPLEX_INSTALL_DIR) \
PETSC_DIR=$(PETSC_DIR_COMPLEX)
@@ -155,13 +153,11 @@ override_dh_auto_install:
override_dh_install:
- dh_install -p$(SLEPC_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --exclude=*html $(SLEPC_DIR_PREFIX)/lib/libslepc_real.so.$(SLEPC_VERSION) usr/lib/$(DEB_HOST_MULTIARCH)
- dh_install -p$(SLEPC_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libslepc_real.so.$(SLEPC_VERSION) usr
- dh_link -p$(SLEPC_VERSIONED_DEV_PACKAGE) usr/lib/$(DEB_HOST_MULTIARCH)/libslepc_real.so.$(SLEPC_VERSION) $(SLEPC_DIR_PREFIX)/lib/libslepc_real.so.$(SLEPC_VERSION)
+ dh_install -p$(SLEPC_REAL_PACKAGE) --sourcedir $(PACKAGE_REAL_INSTALL_BASEDIR) --exclude=*html $(SLEPC_REAL_DIR_PREFIX)/lib/libslepc_real.so.$(SLEPC_VERSION) usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p$(SLEPC_REAL_DEV_PACKAGE) --sourcedir $(PACKAGE_REAL_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libslepc_real.so.$(SLEPC_VERSION) usr
- dh_install -p$(SLEPC_COMPLEX_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html $(SLEPC_COMPLEX_DIR_PREFIX)/lib/libslepc_complex.so.$(SLEPC_VERSION) usr/lib/$(DEB_HOST_MULTIARCH)
- dh_install -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libslepc_complex.so.$(SLEPC_VERSION) usr
- dh_link -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) usr/lib/$(DEB_HOST_MULTIARCH)/libslepc_complex.so.$(SLEPC_VERSION) $(SLEPC_COMPLEX_DIR_PREFIX)/lib/libslepc_complex.so.$(SLEPC_VERSION)
+ dh_install -p$(SLEPC_COMPLEX_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html $(SLEPC_COMPLEX_DIR_PREFIX)/lib/libslepc_complex.so.$(SLEPC_VERSION) usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p$(SLEPC_COMPLEX_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libslepc_complex.so.$(SLEPC_VERSION) usr
override_dh_installdocs:
dh_installdocs --exclude=makefile
@@ -188,8 +184,8 @@ override_dh_installchangelogs:
override_dh_python2:
dh_python2
- dh_python2 -p$(SLEPC_VERSIONED_DEV_PACKAGE) $(SLEPC_DIR_PREFIX)/bin
- dh_python2 -p$(SLEPC_COMPLEX_VERSIONED_DEV_PACKAGE) $(SLEPC_COMPLEX_DIR_PREFIX)/bin
+ dh_python2 -p$(SLEPC_REAL_DEV_PACKAGE) $(SLEPC_REAL_DIR_PREFIX)/bin
+ dh_python2 -p$(SLEPC_COMPLEX_DEV_PACKAGE) $(SLEPC_COMPLEX_DIR_PREFIX)/bin
override_dh_installdeb:
dh_installdeb
@@ -198,8 +194,8 @@ override_dh_installdeb:
done
override_dh_strip:
- dh_strip -p$(SLEPC_VERSIONED_PACKAGE)
- dh_strip -p$(SLEPC_COMPLEX_VERSIONED_PACKAGE)
+ dh_strip -p$(SLEPC_REAL_PACKAGE)
+ dh_strip -p$(SLEPC_COMPLEX_PACKAGE)
override_dh_gencontrol:
# SLEPc.pc depends on specific patch version of PETSc (as defined in PETSc.pc)
--
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