[ncl] 10/22: Move libncl.a to $LIBDIR/ncarg/libncl.a. Closes: #813972.

[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 4e763cd9d6f9f12ca35261d088facbdc48a0627a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Feb 16 01:34:09 2016 +0000

    Move libncl.a to $LIBDIR/ncarg/libncl.a. Closes: #813972.
---
 debian/changelog   | 1 +
 debian/ncarg.pc.in | 2 +-
 debian/rules       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eacba6b..1aa55ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,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.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 10 Feb 2016 13:55:29 +0000
 
diff --git a/debian/ncarg.pc.in b/debian/ncarg.pc.in
index c7a4343..bdc0d50 100644
--- a/debian/ncarg.pc.in
+++ b/debian/ncarg.pc.in
@@ -7,5 +7,5 @@ Name: NCAR Graphics
 Description: Linking for NCAR Graphics
 Version: @VERSION@
 Requires: hdf hdf5 hdf-eos hdf-eos5 netcdf x11 xext cairo
-Libs: -L${libdir} 
+Libs: -L${libdir}/ncarg -L${libdir}
 Libs.private: -lhe5_hdfeos -lhdf_hl -lhdf5 -lsz -lgctp -ljpeg -lz -lpthread
diff --git a/debian/rules b/debian/rules
index f7b7ff5..44c25db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,8 +102,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p debian/libncarg-dev/$(LIBDIR)
-	cp debian/tmp/lib/*.a debian/libncarg-dev/$(LIBDIR)
+	mkdir -p debian/libncarg-dev/$(LIBDIR)/ncarg
+	cp debian/tmp/lib/*.a debian/libncarg-dev/$(LIBDIR)/ncarg
 	mkdir -p debian/libncarg0/$(LIBDIR)
 	cp shared/*.so.1 debian/libncarg0/$(LIBDIR)
 	mkdir -p  debian/libncarg-dev/$(LIBDIR)/pkgconfig

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