[ncl] 12/22: Adjust lib for libncl.a move

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ncl.

commit b623a24a867743f753011c4e22c8182b229e6fa0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Feb 16 04:00:51 2016 +0000

    Adjust lib for libncl.a move
---
 debian/changelog             | 1 +
 debian/patches/envvars.patch | 4 ++--
 debian/rules                 | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9854b92..4eccf0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ncl (6.3.0-7) UNRELEASED; urgency=medium
 
   * Add -lsz to the static libraries needed in ncarg.pc
   * Move libncl.a to $LIBDIR/ncarg/libncl.a. Closes: #813972.
+  * Change $lib to /usr/lib/$arch/ncarg in config/Project
   * Add B-D on libmotif-dev for Motif support.
   * Standards-Version: 3.9.7
 
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index cd6a87c..65157b3 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -2,7 +2,7 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Set default values for Debian paths.
  Debian requires executables work without environmental variables being set,
  so we set default values pointing to all paths.
-Last-Updated: 2013-12-31
+Last-Updated: 2016-02-16
 Forwarded: not-needed
 
 Index: ncl-6.3.0/config/Project
@@ -27,7 +27,7 @@ Index: ncl-6.3.0/config/Project
 -		"man",NULL,"root",NULL,NULL,			\
 -		"ncarg",NULL,"lib",NULL,NULL,			\
 +		"bin",NULL,"root","/usr/bin",NULL,			\
-+		"lib",NULL,"root","/usr/lib",NULL,			\
++		"lib",NULL,"root","/usr/lib/@ARCH@/ncarg",NULL,			\
 +		"include",NULL,"root","/usr/include/ncarg",NULL,		\
 +		"man",NULL,"root","/usr/share/man",NULL,			\
 +		"ncarg",NULL,NULL,"/usr/share/ncarg",NULL,			\
diff --git a/debian/rules b/debian/rules
index 44c25db..a7686e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,9 @@ override_dh_auto_configure:
 	    -e 's/@LDFLAGS@/${LDFLAGS}/' \
 	    -e 's%@DESTDIR@%${DESTDIR}%' \
 	< debian/Site.local.static.in > config/Site.local.static
+	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%' \
+	< config/Project > config/Project.post
+	mv config/Project.post config/Project 
 
 override_dh_auto_build:
 	# First do spherepack. (Later replace this with external spherepack)
@@ -103,6 +106,7 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/libncarg-dev/$(LIBDIR)/ncarg
+	rm debian/tmp/lib/libblas_ncl.a debian/tmp/lib/liblapack_ncl.a
 	cp debian/tmp/lib/*.a debian/libncarg-dev/$(LIBDIR)/ncarg
 	mkdir -p debian/libncarg0/$(LIBDIR)
 	cp shared/*.so.1 debian/libncarg0/$(LIBDIR)

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