[pygrib] 04/14: redo patch

[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 fefe48532b0666249a76f76b7a875765aa628e2d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jan 27 16:32:37 2016 +0000

    redo patch
---
 debian/patches/use_g2clib.patch | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/patches/use_g2clib.patch b/debian/patches/use_g2clib.patch
index 6a0546b..75d62ab 100644
--- a/debian/patches/use_g2clib.patch
+++ b/debian/patches/use_g2clib.patch
@@ -7,26 +7,33 @@ Index: pygrib-2.0.1/setup.py
 ===================================================================
 --- pygrib-2.0.1.orig/setup.py
 +++ pygrib-2.0.1/setup.py
-@@ -79,9 +79,17 @@ man_dir = config.getq(
+@@ -73,15 +73,24 @@ zlib_libdir = config.getq(
+     "directories", "zlib_libdir", environ.get('ZLIB_LIBDIR'))
+ zlib_incdir = config.getq(
+     "directories", "zlib_incdir", environ.get('ZLIB_INCDIR'))
++g2clib_dir = config.getq(
++    "directories", "g2clib_dir", environ.get('G2CLIB_DIR'))
++g2clib_libdir = config.getq(
++    "directories", "g2clib_libdir", environ.get('G2CLIB_LIBDIR'))
++g2clib_incdir = config.getq(
++    "directories", "g2clib_incdir", environ.get('G2CLIB_INCDIR'))
+ # where to install man pages?
+ man_dir = config.getq(
+     "directories", "man_dir", environ.get('MAN_DIR'))
  grib_api_libname = config.getq(
      "files", "grib_api_libname", 'grib_api')
++grib2c_api_libname = config.getq(
++    "files", "grib2c_libname", 'grib2c')
  
-+try: g2clib_dir = config.get("directories", "g2clib_dir")
-+except: pass
-+try: g2clib_libdir = config.get("directories", "g2clib_libdir")
-+except: pass
-+try: g2clib_incdir = config.get("directories", "g2clib_incdir")
-+except: pass
-+
  libdirs=[]
  incdirs=[numpy.get_include()]
 -libraries=[grib_api_libname]
-+libraries=[grib_api_libname, 'grib2c']
++libraries=[grib_api_libname, g2c_api_libname]
 +macros=[]
  
  if grib_api_libdir is None and grib_api_dir is not None:
      libdirs.append(os.path.join(grib_api_dir,'lib'))
-@@ -122,31 +130,34 @@ if zlib_libdir is None and zlib_dir is n
+@@ -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