[metview] 82/97: Move metview_bin/* to /usr/lib/$(ARCH)/metview for multi-arch safety

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit c0976ce62dfb6dc2a46f19e7d5d24973e911a2b7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 23 08:46:16 2015 +0100

    Move metview_bin/* to /usr/lib/$(ARCH)/metview for multi-arch safety
---
 debian/{CONFIG.site => CONFIG.site.in} |  2 +-
 debian/changelog                       |  1 +
 debian/rules                           | 15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/CONFIG.site b/debian/CONFIG.site.in
similarity index 95%
rename from debian/CONFIG.site
rename to debian/CONFIG.site.in
index b0228a7..0a5ad2e 100644
--- a/debian/CONFIG.site
+++ b/debian/CONFIG.site.in
@@ -11,7 +11,7 @@ PATH=::${PATH}
 INSTALLDIR=/usr
 METVIEW_SCRIPT=metview
 MV_MARS_ACCESS=MARS_webapi
-METVIEW_BIN=/usr/lib/metview_bin
+METVIEW_BIN=/usr/lib/@ARCH@/metview_bin
 MARS_HOME=
 # Remove METVIEW_DIR_DEV on installation
 METVIEW_DIR_DEV=UNDEFINED
diff --git a/debian/changelog b/debian/changelog
index e1dcfc6..07dbc34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ metview (4.5.6-1) unstable; urgency=medium
   * no-m32 patch temporarily disabled.
   * Need to build-depend on libgrib-api-tools
   * Now B-D on openjpeg-dev. 
+  * Move metview_bin/* to /usr/lib/$(ARCH)/metview for multi-arch safety
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 22 Jul 2015 19:39:15 +0100
 
diff --git a/debian/rules b/debian/rules
index 118177b..d7fbcef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 export METVIEW_DIR_DEV=$(CURDIR)
 PATH:=$(PATH):$(CURDIR)/scripts
-MV_COMP:=$(DESTDIR)/usr/bin/Metview/mv_compress
+MV_DIR:=/usr/lib/$(DEB_HOST_MULTIARCH)/metview
 
 # magic debhelper rule
 %:
@@ -47,7 +47,8 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	# override CONFIG.site to make reproducible, set METVIEW_BIN_DIR
-	cp debian/CONFIG.site obj-*/scripts
+	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in \
+		> obj-*/scripts/CONFIG.site 
 	dh_auto_install
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
@@ -55,11 +56,11 @@ override_dh_auto_install:
 override_dh_fixperms:
 	dh_fixperms
 	rm -rf debian/metview-data/usr/share/applications
-	chmod +x debian/metview/usr/lib/metview/mv_compress
-	chmod -x debian/metview/usr/lib/metview/metview_*.common
-	chmod -x debian/metview/usr/lib/metview/metview_stat
-	chmod -x debian/metview/usr/lib/metview/metview_patches
-	file debian/metview/usr/lib/metview/* | grep ELF | cut -f1 -d: | xargs chrpath -d
+	chmod +x debian/metview/$(MV_DIR)/mv_compress
+	chmod -x debian/metview/$(MV_DIR)/metview_*.common
+	chmod -x debian/metview/$(MV_DIR)/metview_stat
+	chmod -x debian/metview/$(MV_DIR)/metview_patches
+	file debian/metview/$(MV_DIR)/* | grep ELF | cut -f1 -d: | xargs chrpath -d
 	# This directory won't exist on arch-only builds, so ...
 	[ ! -d debian/metview-data/usr/share/metview ] || (  \
 		chmod -R -x debian/metview-data/usr/share/metview/* ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git