[hypre] 03/03: update installation into deb packages

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository hypre.

commit 69f90702389594f5e8a52ae81cb4399674df18e9
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Nov 1 08:46:06 2016 +0800

    update installation into deb packages
    
    - header files in hypre subdir
    - multiarch libs
    
    Need to use dh_install --exclude to keep the versioned so files out of
    libhypre-dev, so use override_dh_install instead of
    libhypre-dev.install (i.e. libhypre-dev.files)
---
 debian/libhypre-2.11.1.files |  1 -
 debian/libhypre-dev.files    |  3 ---
 debian/rules                 | 12 ++++++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/libhypre-2.11.1.files b/debian/libhypre-2.11.1.files
deleted file mode 100644
index a1d2f70..0000000
--- a/debian/libhypre-2.11.1.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*-2.11.1.so
diff --git a/debian/libhypre-dev.files b/debian/libhypre-dev.files
deleted file mode 100644
index 571cc99..0000000
--- a/debian/libhypre-dev.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*.a
-usr/lib/*.so
-usr/include/*.h
diff --git a/debian/rules b/debian/rules
index 113d6df..823fa99 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
+export HYPRE_SOVERSION=2.11.1
+
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic -O3 -march=native
 export DEB_CXXFLAGS_MAINT_APPEND  = -Wall -pedantic -O3 -march=native
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed
@@ -95,6 +97,16 @@ override_dh_auto_test:
 	echo "Building test"
 	$(MAKE) -C src test	
 
+# upstream places the soname in front of .so
+# which makes it trickier than desirable to exclude
+# the versioned so files in a libhypre-dev.install file
+# Easier to just override instead
+override_dh_install:
+	dh_install -p libhypre-$(HYPRE_SOVERSION) usr/lib/*/*${HYPRE_SOVERSION}.so
+	dh_install -p libhypre-dev --exclude=${HYPRE_SOVERSION} usr/lib/*/*
+	dh_install -p libhypre-dev usr/include/hypre
+
+
 # run examples (add -W, -no-as-needed on Unbuntu for ex5f)
 #	echo "Building examples"
 #	$(MAKE) -C src/examples \

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