[ossim] 04/04: Require at least libgeos-dev 3.5.0 for Multi-Arch paths.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim.

commit ab9be526a545674f789343ecabc6e1aaf3458a65
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 18 15:02:10 2015 +0200

    Require at least libgeos-dev 3.5.0 for Multi-Arch paths.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04e0532..d0741cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ossim (1.8.16-5) UNRELEASED; urgency=medium
   * Add initial watch file by Tobias Frost, add uscan options for passive FTP
     and version mangling. (closes: #789367)
   * Override dh_install to use --list-missing.
+  * Require at least libgeos-dev 3.5.0 for Multi-Arch paths.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Jun 2015 15:13:39 +0200
 
diff --git a/debian/control b/debian/control
index e09e631..00ccd78 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
                libcurl4-gnutls-dev | libcurl4-dev,
                libexpat1-dev,
                libfreetype6-dev,
-               libgeos-dev,
+               libgeos-dev (>= 3.5.0),
                libgeotiff-dev,
                libgif-dev,
                libjpeg-dev,
diff --git a/debian/rules b/debian/rules
index eebc2d9..9fee589 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,10 @@ CMAKE_OPTS = \
        -DBUILD_OSSIM_MPI_SUPPORT=OFF \
        -DBUILD_OSSIM_TEST_APPS=ON \
        -DBUILD_SHARED_LIBS=ON \
-	   -DGEOS_C_LIB=/usr/lib/libgeos_c.so \
+	   -DGEOS_C_LIB=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos_c.so \
 	   -DGEOS_INCLUDE_DIR=/usr/include/geos \
-	   -DGEOS_LIB=/usr/lib/libgeos.so \
-	   -DGEOS_LIBRARY=/usr/lib/libgeos_c.so \
+	   -DGEOS_LIB=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos.so \
+	   -DGEOS_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos_c.so \
 	   -DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff \
        -DCMAKE_MODULE_PATH=$(CURDIR)/CMakeModules \
 	   -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \

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