[ncl] 13/22: * Remove jasper * Move ncl.a to $LIBIDR/ncarg

[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 ec85360913e14514c0ab9fd1b565347577bb45bd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 1 09:08:04 2016 +0000

    * Remove jasper
    * Move ncl.a to $LIBIDR/ncarg
---
 debian/changelog                   |  8 +++++---
 debian/patches/envvars.patch       |  2 +-
 debian/patches/remove-jasper.patch | 19 +++++++++++++++++++
 debian/patches/series              |  1 +
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4eccf0e..36ff9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-ncl (6.3.0-7) UNRELEASED; urgency=medium
+ncl (6.3.0-7) unstable; urgency=medium
 
   * Add -lsz to the static libraries needed in ncarg.pc
   * Move libncl.a to $LIBDIR/ncarg/libncl.a. Closes: #813972.
+  * Change ncargpath lib to $LIBDIR/ncarg and add .so
   * Change $lib to /usr/lib/$arch/ncarg in config/Project
   * Add B-D on libmotif-dev for Motif support.
-  * Standards-Version: 3.9.7
+  * Standards-Version: 3.9.7. No changes required
+  * Drop linking against jasper as it is being removed from Debian.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 10 Feb 2016 13:55:29 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 29 Feb 2016 21:01:26 +0000
 
 ncl (6.3.0-6) unstable; urgency=medium
 
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index 65157b3..c92d12e 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -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/@ARCH@/ncarg",NULL,			\
++		"lib",NULL,NULL,"/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/patches/remove-jasper.patch b/debian/patches/remove-jasper.patch
new file mode 100644
index 0000000..ca3d8fd
--- /dev/null
+++ b/debian/patches/remove-jasper.patch
@@ -0,0 +1,19 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Remove jasper; GRIB2lib no longer links against it,
+ and it is beinf removed from Debian.
+Last-Updated: 2016-03-01
+Forwarded: no
+
+Index: ncl-6.3.0/config/Project
+===================================================================
+--- ncl-6.3.0.orig/config/Project
++++ ncl-6.3.0/config/Project
+@@ -295,7 +295,7 @@
+ #endif
+ 
+ #ifndef	GRIB2lib
+-#define       GRIB2lib   -lgrib2c -ljasper -lpng -lz -ljpeg
++#define       GRIB2lib   -lgrib2c  -lpng -lz -ljpeg
+ #endif	/* GRIB2lib */
+ 
+ #ifndef	NetCDFlib
diff --git a/debian/patches/series b/debian/patches/series
index 969a66c..257fef8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ ftuser.patch
 ncldriver.patch
 deblibs.patch
 reproducible.patch
+remove-jasper.patch

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