[libvigraimpex] 02/04: add support for multiarch

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit 556d1226e7ae500afea8c7d14da7321c00cb168f
Author: Daniel Stender <debian at danielstender.com>
Date:   Sun Feb 14 20:57:18 2016 +0100

    add support for multiarch
---
 debian/changelog                 | 3 ++-
 debian/control                   | 3 +++
 debian/libvigraimpex-dev.install | 2 +-
 debian/libvigraimpex6.install    | 2 +-
 debian/rules                     | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a30b3f..ece65b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
 
   [ Daniel Stender ]
   * Build libvigraimpex6 (Closes: #813415).
+  * Add support for multiarch (Closes: #812560).
   * deb/control:
     + depend libvigraimpex-dev on libpng-dev [thanks to Tobias Frost].
     + use HTTPS for Vcs fields.
@@ -24,7 +25,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
     + deb/control: version libboost-python-dev build-dependency.
     + deb/rules: tighten dh_makeshlibs -V argument.
 
- -- Daniel Stender <debian at danielstender.com>  Sun, 14 Feb 2016 02:07:24 +0100
+ -- Daniel Stender <debian at danielstender.com>  Sun, 14 Feb 2016 20:55:59 +0100
 
 libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index da5fbbf..c111d0c 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Homepage: http://hci.iwr.uni-heidelberg.de/vigra/
 Package: libvigraimpex-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libfftw3-dev,
  libhdf5-dev (>= 1.8),
@@ -65,6 +66,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Replaces:
  libvigraimpex5v5 (>= 1.10.0+git20160120.803d5d4-1)
 Description: C++ computer vision library
diff --git a/debian/libvigraimpex-dev.install b/debian/libvigraimpex-dev.install
index f75b4b7..fccf26c 100644
--- a/debian/libvigraimpex-dev.install
+++ b/debian/libvigraimpex-dev.install
@@ -1,3 +1,3 @@
 /usr/bin/vigra-config
 /usr/include/*
-/usr/lib/lib*.so
+/usr/lib/*/lib*.so
diff --git a/debian/libvigraimpex6.install b/debian/libvigraimpex6.install
index eeaf559..d6a64d3 100644
--- a/debian/libvigraimpex6.install
+++ b/debian/libvigraimpex6.install
@@ -1 +1 @@
-/usr/lib/lib*.so.*
+/usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 3ae901a..a9715ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ endif
 
 cmake_options = \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)/" \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_OPENEXR=ON \
     -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \

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