[ossim] 01/02: Update geotiff Multi-Arch library path.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository ossim.

commit 6d6b0c5b86bb0eeecaff35ee7ded249a8c0a4872
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 2 13:13:02 2014 +0100

    Update geotiff Multi-Arch library path.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 61a4613..52cb846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ossim (1.8.16-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update geotiff Multi-Arch library path.
+    (closes: #767738)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 02 Nov 2014 12:49:10 +0100
+
 ossim (1.8.16-2) unstable; urgency=medium
 
   * Removed Geos C++ b-d.
diff --git a/debian/rules b/debian/rules
index d1ea5cb..fce4923 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 OSSIM_VERSION=$(shell dpkg-parsechangelog|grep Version:|cut -d' ' -f2|cut -d- -f1)
 OSSIM_VERSION_TAG=$(subst .,_,$(OSSIM_VERSION))
 
+DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
     OPTFLAG =
@@ -32,7 +34,7 @@ CMAKE_OPTS = \
 	   -DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff \
        -DCMAKE_MODULE_PATH=$(CURDIR)/CMakeModules \
 	   -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \
-	   -DGEOTIFF_LIBRARY=/usr/lib/libgeotiff.so
+	   -DGEOTIFF_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeotiff.so
 
 override_dh_auto_configure:
 	[ -d debian/build ] || mkdir debian/build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git