[SCM] shapelib branch, master, updated. upstream/1.2.10-11-g89f5fae

[Arto Jantunen]

The following commit has been merged in the master branch:
commit 4c7f64e924efacc7e87de4081195e326104d77ce
Author: Arto Jantunen <arto.jantunen at logica.com>
Date:   Mon Apr 30 15:15:22 2012 +0300

    Enable multiarch (Closes: #670632)

diff --git a/debian/control b/debian/control
index 88e080e..402ae03 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: shapelib
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: A library for reading and writing ArcView Shapefiles - tools
  The Shapefile format is a working and interchange format promoted by
  ESRI for simple vector data with attributes. It is apparently the only
@@ -22,6 +23,7 @@ Package: libshp-dev
 Section: libdevel
 Architecture: any
 Depends: libshp1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: A library for reading and writing ArcView Shapefiles - development files
  The Shapefile format is a working and interchange format promoted by
  ESRI for simple vector data with attributes. It is apparently the only
@@ -34,6 +36,8 @@ Package: libshp1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: A library for reading and writing ArcView Shapefiles
  The Shapefile format is a working and interchange format promoted by
  ESRI for simple vector data with attributes. It is apparently the only
diff --git a/debian/libshp-dev.install b/debian/libshp-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libshp-dev.install
+++ b/debian/libshp-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libshp1.install b/debian/libshp1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libshp1.install
+++ b/debian/libshp1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 89795ad..9e58484 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
@@ -16,13 +18,13 @@ override_dh_auto_clean:
 override_dh_auto_install:
         # have to copy the files by hand.:(
 	mkdir -p debian/tmp/usr/bin/
-	mkdir debian/tmp/usr/lib/
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	mkdir debian/tmp/usr/include/
 	cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind \
 	shptest debian/tmp/usr/bin/
-	cp .libs/libshp.a debian/tmp/usr/lib/
-	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/
+	cp .libs/libshp.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	ln -s libshp.so.1.0.1 libshp.so
 	ln -s libshp.so.1.0.1 libshp.so.1
-	mv libshp.so* debian/tmp/usr/lib/
+	mv libshp.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	cp shapefil.h debian/tmp/usr/include/

-- 
Library for reading and writing ArcView Shapefiles