[SCM] libspatialindex branch, master, updated. upstream/1.7.0-29-g8f2f076

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 2c42c69878e1a7f727d959e1e5ce4570fa9c6e03
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 10 19:16:20 2014 +0100

    Support Multi-Arch build.

diff --git a/debian/changelog b/debian/changelog
index 45162a7..a5da23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ spatialindex (1.8.1-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility to 9.
   * Use minimal dh rules with dh-autoreconf.
     (closes: #734827)
+  * Support Multi-Arch build.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 10 Jan 2014 16:38:53 +0100
 
diff --git a/debian/control b/debian/control
index 1813a47..dd0f807 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Homepage: http://libspatialindex.github.io/
 
 Package: libspatialindex-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libspatialindex1 (= ${binary:Version})
 Recommends: pkg-config
@@ -27,7 +28,9 @@ Description: A general framework for developing spatial indices
 
 Package: libspatialindex1
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: A general framework for developing spatial indices - development files
diff --git a/debian/libspatialindex-dev.install b/debian/libspatialindex-dev.install
index 9b0ea48..b852a8d 100644
--- a/debian/libspatialindex-dev.install
+++ b/debian/libspatialindex-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
diff --git a/debian/libspatialindex1.install b/debian/libspatialindex1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libspatialindex1.install
+++ b/debian/libspatialindex1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

-- 
A general framework for developing spatial indices