[pygrib] 05/14: Drop jasper from Debian as obsolete; using openjpeg instead.

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/2.0.1-3
in repository pygrib.

commit c7d3db60a827fd9cb83e3427e77352606359eb22
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 29 11:08:22 2016 +0000

    Drop jasper from Debian as obsolete; using openjpeg instead.
---
 debian/changelog                |  6 ++++++
 debian/control                  |  2 +-
 debian/patches/use_g2clib.patch | 28 ++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab0d7db..21fb7b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pygrib (2.0.1-2) UNRELEASED; urgency=medium
+
+  * Drop jasper from Debian as obsolete; using openjpeg instead.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 29 Feb 2016 11:07:53 +0000
+
 pygrib (2.0.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3bdb075..45f76e2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), chrpath,
  python3-all-dev, python3-numpy, dh-python,
  python-numpy, python-all-dev,
  libgrib-api-dev, libgrib2c-dev, 
- libjasper-dev, libpng-dev, libopenjpeg-dev
+ libpng-dev, libopenjpeg-dev
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
diff --git a/debian/patches/use_g2clib.patch b/debian/patches/use_g2clib.patch
index 75d62ab..8ab65d1 100644
--- a/debian/patches/use_g2clib.patch
+++ b/debian/patches/use_g2clib.patch
@@ -1,13 +1,13 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: On Debian, use libgrib2c library rather than embedded version.
 Forwarded: not-needed
-Last-Updated: 2013-11-28
+Last-Updated: 2016-02-29
 
 Index: pygrib-2.0.1/setup.py
 ===================================================================
 --- pygrib-2.0.1.orig/setup.py
 +++ pygrib-2.0.1/setup.py
-@@ -73,15 +73,24 @@ zlib_libdir = config.getq(
+@@ -73,30 +73,39 @@ zlib_libdir = config.getq(
      "directories", "zlib_libdir", environ.get('ZLIB_LIBDIR'))
  zlib_incdir = config.getq(
      "directories", "zlib_incdir", environ.get('ZLIB_INCDIR'))
@@ -33,6 +33,30 @@ Index: pygrib-2.0.1/setup.py
  
  if grib_api_libdir is None and grib_api_dir is not None:
      libdirs.append(os.path.join(grib_api_dir,'lib'))
+     libdirs.append(os.path.join(grib_api_dir,'lib64'))
+ if grib_api_incdir is None and grib_api_dir is not None:
+     incdirs.append(os.path.join(grib_api_dir,'include'))
+-
+-if jasper_dir is not None or jasper_libdir is not None:
+-    libraries.append("jasper")
+-if jasper_libdir is None and jasper_dir is not None:
+-    libdirs.append(os.path.join(jasper_dir,'lib'))
+-    libdirs.append(os.path.join(jasper_dir,'lib64'))
+-if jasper_incdir is None and jasper_dir is not None:
+-    incdirs.append(os.path.join(jasper_dir,'include'))
+-    incdirs.append(os.path.join(jasper_dir,'include/jasper'))
++# Disable jasper in Debian.
++#if jasper_dir is not None or jasper_libdir is not None:
++#     libraries.append("jasper")
++# if jasper_libdir is None and jasper_dir is not None:
++#     libdirs.append(os.path.join(jasper_dir,'lib'))
++#     libdirs.append(os.path.join(jasper_dir,'lib64'))
++# if jasper_incdir is None and jasper_dir is not None:
++#     incdirs.append(os.path.join(jasper_dir,'include'))
++#     incdirs.append(os.path.join(jasper_dir,'include/jasper'))
+ 
+ if openjpeg_dir is not None or openjpeg_libdir is not None:
+     libraries.append("openjpeg")
 @@ -122,31 +131,34 @@ if zlib_libdir is None and zlib_dir is n
  if zlib_incdir is None and zlib_dir is not None:
      incdirs.append(os.path.join(zlib_dir,'include'))

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