[pygrib] 01/02: Link against libeccodes instead of libgrib-api (which is deprecated)

[Alastair McKinstry]

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

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

commit d285d89b4198f71e9b27602a6c5654234ca8603e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 10 15:18:25 2017 +0100

    Link against libeccodes instead of libgrib-api (which is deprecated)
---
 debian/changelog             |  6 +++++
 debian/control               |  8 +++---
 debian/patches/eccodes.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 4 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a98de7c..34cacb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pygrib (2.0.2-2) UNRELEASED; urgency=medium
+
+  * Link against libeccodes instead of libgrib-api (which is deprecated)
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 10 Jul 2017 15:17:31 +0100
+
 pygrib (2.0.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 62cee82..0187261 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), chrpath,
  python-pyproj, python3-pyproj,
  python-numpy, python-all-dev,
  python-setuptools, python3-setuptools,
- libgrib-api-dev, libgrib2c-dev, 
+ libeccodes-dev, libgrib2c-dev, 
  libpng-dev
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.6
@@ -17,12 +17,12 @@ Vcs-Git:  git://git.debian.org/git/debian-science/packages/pygrib.git
 
 Package: python-grib
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}, libeccodes-data,
  ${python:Depends}, python-numpy, python-pyproj,
  libgrib-api-dev, libgrib2c-dev,
  python3-grib (>> 2.0.0-1)
 Provides: ${python:Provides}
-Recommends: python-grib-doc, 
+Recommends: python-grib-doc
 Description:  Python module for reading and writing GRIB files
  Python module for reading and writing GRIB (editions 1 and 2) files.
  GRIB is the World Meterological Organization standard for
@@ -33,7 +33,7 @@ Description:  Python module for reading and writing GRIB files
 Package: python3-grib
 Recommends: python-grib-doc
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}, libeccodes-data,
  ${python3:Depends}, python3-numpy, python3-pyproj,
  libgrib-api-dev, libgrib2c-dev
 Replaces: python-grib (<< 2.0.0-1), python-grib-doc ( << 2.0.0-2)
diff --git a/debian/patches/eccodes.patch b/debian/patches/eccodes.patch
new file mode 100644
index 0000000..d2ee4d7
--- /dev/null
+++ b/debian/patches/eccodes.patch
@@ -0,0 +1,58 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Link against libeccodes instead of libgrib-api
+Last-Updated: 2017-07-10
+Forwarded: no
+
+Index: pygrib-2.0.2/setup.py
+===================================================================
+--- pygrib-2.0.2.orig/setup.py
++++ pygrib-2.0.2/setup.py
+@@ -44,12 +44,12 @@ config = _ConfigParser()
+ if os.path.exists(setup_cfg):
+     sys.stdout.write('reading from setup.cfg...')
+     config.read(setup_cfg)
+-grib_api_dir = config.getq(
+-    "directories", "grib_api_dir", environ.get('GRIBAPI_DIR'))
+-grib_api_libdir = config.getq(
+-    "directories", "grib_api_libdir", environ.get('GRIBAPI_LIBDIR'))
+-grib_api_incdir = config.getq(
+-    "directories", "grib_api_incdir", environ.get('GRIBAPI_INCDIR'))
++eccodes_dir = config.getq(
++    "directories", "eccodes_dir", environ.get('GRIBAPI_DIR'))
++eccodes_libdir = config.getq(
++    "directories", "eccodes_libdir", environ.get('GRIBAPI_LIBDIR'))
++eccodes_incdir = config.getq(
++    "directories", "eccodes_incdir", environ.get('GRIBAPI_INCDIR'))
+ g2clib_dir = config.getq(
+     "directories", "g2clib_dir", environ.get('G2CLIB_DIR'))
+ g2clib_libdir = config.getq(
+@@ -59,21 +59,21 @@ g2clib_incdir = config.getq(
+ # 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')
++eccodes_libname = config.getq(
++    "files", "eccodes_libname", 'eccodes')
+ grib2c_api_libname = config.getq(
+     "files", "grib2c_libname", 'grib2c')
+ 
+ libdirs=[]
+ incdirs=[numpy.get_include()]
+-libraries=[grib_api_libname, grib2c_api_libname]
++libraries=[eccodes_libname, grib2c_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'))
+-    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 eccodes_libdir is None and eccodes_dir is not None:
++    libdirs.append(os.path.join(eccodes_dir,'lib'))
++    libdirs.append(os.path.join(eccodes_dir,'lib64'))
++if eccodes_incdir is None and eccodes_dir is not None:
++    incdirs.append(os.path.join(eccodes_dir,'include'))
+ 
+ macros.append(('USE_JPEG2000',1))
+ macros.append(('USE_PNG',1))
diff --git a/debian/patches/series b/debian/patches/series
index 4d3a8c6..dbe53df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use_g2clib.patch
 packed-4bytes.patch
 setuptools.patch
 remove-unnecessary-deps.patch
+eccodes.patch

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