tags 670632 + patch
thanks

Here is a patch to enable multiarch for shapelib.

-- 
Arto Jantunen

commit c1708e7fcb7897685808cd861b14d27b1a6c5a95
Author: Arto Jantunen <vi...@debian.org>
Date:   Sat Apr 28 11:46:48 2012 +0300

    Enable multiarch

diff --git a/debian/control b/debian/control
index 691ec0e..f6c296f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: shapelib
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 3.8.3
 Homepage: http://shapelib.maptools.org/
 
@@ -34,6 +34,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/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 874e879..2f3eca2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -43,13 +45,14 @@ install: build
 	cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind shptest \
 		debian/tmp/usr/bin/.
 	
-	mkdir debian/tmp/usr/lib/
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	cp .libs/libshp.a debian/tmp/usr/lib/
 	cp libshp.la debian/tmp/usr/lib/
-	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/
-	ln -s libshp.so.1.0.1 libshp.so
+	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	ln -s $(DEB_HOST_MULTIARCH)/libshp.so.1.0.1 libshp.so
+	mv libshp.so debian/tmp/usr/lib
 	ln -s libshp.so.1.0.1 libshp.so.1
-	mv libshp.so* debian/tmp/usr/lib/
+	mv libshp.so.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	
 	mkdir debian/tmp/usr/include/
 	cp shapefil.h debian/tmp/usr/include/
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to