[cdo] 03/03: add eccodes.patch

[Alastair McKinstry]

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

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

commit 537059d929e5bf52f5dc7dc0e313cd2dc3e2f97a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Nov 30 10:33:09 2016 +0000

    add eccodes.patch
---
 debian/changelog             |  5 ++--
 debian/control               |  2 +-
 debian/patches/eccodes.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26584a7..d0a21da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-cdo (1.7.2+dfsg.1-2) UNRELEASED; urgency=medium
+cdo (1.7.2+dfsg.1-2) unstable; urgency=medium
 
   * Now cdo recommends: python*-cdo.  
   * Use debhelper 10
   * Build against libeecodes-dev not libgrib-api-dev
+    - add eccodes.patch
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 10 Aug 2016 02:45:20 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 30 Nov 2016 10:30:49 +0000
 
 cdo (1.7.2+dfsg.1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4ef7cc3..878ee95 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10), dh-buildinfo, libproj-dev, autoconf, automake,
  libnetcdf-dev, netcdf-bin, libhdf5-serial-dev,  
  libfftw3-dev, libudunits2-dev,
  gfortran, dh-autoreconf, 
- libeccodes-dev | libgrib-api-dev (>= 1.14.5-2), 
+ libeccodes-dev,
  libtool, cfortran,
  libmagics++-dev (>= 2.24.7-7),
  libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev
diff --git a/debian/patches/eccodes.patch b/debian/patches/eccodes.patch
new file mode 100644
index 0000000..cd08cdc
--- /dev/null
+++ b/debian/patches/eccodes.patch
@@ -0,0 +1,58 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Build against eccodes lib, not libgrib_api
+Last-Updated: 2016-11-30
+Forwarded: no
+
+Index: cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
+===================================================================
+--- cdo-1.7.2+dfsg.1.orig/libcdi/m4/acx_options.m4
++++ cdo-1.7.2+dfsg.1/libcdi/m4/acx_options.m4
+@@ -240,7 +240,7 @@ AC_ARG_WITH([grib_api],
+                            AC_MSG_RESULT([suppressed])],
+                      [yes],[AC_CHECK_HEADERS([grib_api.h])
+                             AC_SEARCH_LIBS([grib_get_message],
+-                                           [grib_api],
++                                           [eccodes],
+                                            [AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])],
+                                            [AC_MSG_ERROR([Could not link to grib_api library])])],
+                      [*],[GRIB_API_ROOT=$with_grib_api
+@@ -249,10 +249,10 @@ AC_ARG_WITH([grib_api],
+                                  CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
+                                  AC_CHECK_HEADERS([grib_api.h])
+                                  AC_SEARCH_LIBS([grib_get_message],
+-                                                [grib_api],
++                                                [eccodes],
+                                                 [AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])],
+                                                 [AC_MSG_ERROR([Could not link to grib_api library])])
+-                                 GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -lgrib_api"
++                                 GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -leccodes"
+                                  GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
+                                 [AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
+             [AC_MSG_CHECKING([for the GRIB_API library])
+Index: cdo-1.7.2+dfsg.1/m4/acx_options.m4
+===================================================================
+--- cdo-1.7.2+dfsg.1.orig/m4/acx_options.m4
++++ cdo-1.7.2+dfsg.1/m4/acx_options.m4
+@@ -266,7 +266,7 @@ AC_ARG_WITH([grib_api],
+                            AC_MSG_RESULT([suppressed])],
+                      [yes],[AC_CHECK_HEADERS([grib_api.h])
+                             AC_SEARCH_LIBS([grib_get_message],
+-                                           [grib_api],
++                                           [eccodes],
+                                            [AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
+                                             ENABLE_GRIBAPI=yes],
+                                            [AC_MSG_ERROR([Could not link to grib_api library])])],
+@@ -276,11 +276,11 @@ AC_ARG_WITH([grib_api],
+                                  CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
+                                  AC_CHECK_HEADERS([grib_api.h])
+                                  AC_SEARCH_LIBS([grib_get_message],
+-                                                [grib_api],
++                                                [eccodes],
+                                                 [AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
+                                                  ENABLE_GRIBAPI=yes],
+                                                 [AC_MSG_ERROR([Could not link to grib_api library])])
+-                                 GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -lgrib_api"
++                                 GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -leccodes"
+                                  GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
+                                 [AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
+             [AC_MSG_CHECKING([for the GRIB_API library])
diff --git a/debian/patches/series b/debian/patches/series
index 1e9d82e..af0aa43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ reproducible-builds.patch
 ppc64el.patch
 libc-2.23-fixes.patch
 hppa_gomp_bug.patch
+eccodes.patch

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