[silo-llnl] 13/96: Fixes for multarch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 0a93367425e28f74a46f21e4d3860340ab31d31d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Aug 25 14:22:55 2011 +0100

    Fixes for multarch
---
 debian/libsilo-dev.dirs    | 2 --
 debian/libsilo-dev.install | 2 +-
 debian/libsilo-dev.links   | 1 -
 debian/rules               | 4 ++++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/libsilo-dev.dirs b/debian/libsilo-dev.dirs
deleted file mode 100644
index b448f1a..0000000
--- a/debian/libsilo-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/pkgconfig
diff --git a/debian/libsilo-dev.install b/debian/libsilo-dev.install
index d20d296..b4089fa 100644
--- a/debian/libsilo-dev.install
+++ b/debian/libsilo-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libsiloh5.a	
+usr/lib/*/libsiloh5.a	
 usr/include/*
diff --git a/debian/libsilo-dev.links b/debian/libsilo-dev.links
deleted file mode 100644
index 1b6e24c..0000000
--- a/debian/libsilo-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libsiloh5.so.0.0.0 /usr/lib/libsiloh5.so
diff --git a/debian/rules b/debian/rules
index 42c8c24..a6e9720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ include /usr/share/mpi-default-dev/debian_defaults
 MPI_INC=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include
 
 PYVERS:= `pyversions -s`
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-qt-bin=/usr/bin --with-qt-lib=/usr/lib  --with-qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I$(MPI_INC)"
@@ -32,6 +33,9 @@ override_dh_auto_install:
 		chrpath -d debian/Silo.so.$$p ; \
 		cp debian/Silo.so.$$p debian/python-silo/usr/lib/$$p/site-packages/Silo.so ; \
 	done
+	dh_link -l libsilo0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0
+	dh_link -l libsilo-dev /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so
+	mkdir -p debian/libsilo-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 
 override_dh_auto_clean:
 	dh_clean

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