[mapserver] 29/43: Multi-Arch changes.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapserver.

commit aa6194777e366b3e0f80d0c28d0e30c5568e1898
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 20 02:41:19 2013 +0200

    Multi-Arch changes.
---
 debian/control                        | 1 +
 debian/libmapserver-6.2.1-dev.install | 4 ++--
 debian/libmapserver-6.2.1.install     | 2 +-
 debian/rules                          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 6479aa1..57eaec2 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Replaces: libmapserver (<< 6.2.1-3~bpo70+1linuxminded4)
 Breaks: libmapserver (<< 6.2.1-3~bpo70+1linuxminded4)
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
  php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
diff --git a/debian/libmapserver-6.2.1-dev.install b/debian/libmapserver-6.2.1-dev.install
index 073899d..bbe1641 100644
--- a/debian/libmapserver-6.2.1-dev.install
+++ b/debian/libmapserver-6.2.1-dev.install
@@ -1,4 +1,4 @@
 usr/bin/mapserver-config
 usr/include/mapserver/*
-usr/lib/libmapserver.la
-usr/lib/libmapserver.so
+usr/lib/*/libmapserver.la
+usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver-6.2.1.install b/debian/libmapserver-6.2.1.install
index 0c84993..01666b4 100644
--- a/debian/libmapserver-6.2.1.install
+++ b/debian/libmapserver-6.2.1.install
@@ -1 +1 @@
-usr/lib/libmapserver-*.so
+usr/lib/*/libmapserver-*.so
diff --git a/debian/rules b/debian/rules
index 7b2f903..3d5b58c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,7 @@ override_dh_auto_install:
 	-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/$(PHP5API)/*.la
 
 	# empty dependency_libs in la file
-	sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/libmapserver.la
+	sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/*/libmapserver.la
 
 	# CGI mapserver
 	-mkdir -p debian/tmp/usr/lib/cgi-bin

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