[emos] 05/13: Now build in preference against eccodes, not libgrib-api

[Alastair McKinstry]

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

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

commit bcc1f9490026ef8cdb780ac8bd5c36965a3b82fa
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Nov 28 17:26:03 2016 +0000

    Now build in preference against eccodes, not libgrib-api
---
 debian/changelog            | 1 +
 debian/control              | 3 ++-
 debian/patches/shared.patch | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e2cef9..a681517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 emoslib (2:4.4.5-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Now build in preference against eccodes, not libgrib-api
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 28 Nov 2016 17:11:41 +0000
 
diff --git a/debian/control b/debian/control
index 6ca0fd3..89e9ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>=10), gfortran, cmake (>= 2.8.11), 
  libboost-dev (>= 1.47.0), libboost-test-dev, chrpath,
- libgrib-api-dev (>= 1.14.7-1~), libgrib-api-tools,
+ libeccodes-dev | libgrib-api-dev (>= 1.14.7-1~), 
+ libeccodes-tools | libgrib-api-tools,
  zlib1g-dev,
  libfftw3-dev,
  libpython2.7-dev, libnetcdf-dev
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 162594e..4bb3e90 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,7 +4,7 @@ Description: Enable building shared libs in emoslib (cmake)
  but a cleaner patch than before.
  Needs to build -fpic, -mcmodel=medium for shared, but preferably don't
  for static, so build in separate dirs.
-Last-Update: 2015-07-09
+Last-Update: 2016-11-28
 Forwarded: no
 
 Index: emoslib-4.4.5/libemos-sp-shared/CMakeLists.txt
@@ -30,7 +30,7 @@ Index: emoslib-4.4.5/libemos-sp-shared/CMakeLists.txt
 +  VERSION     0d
 +  OUTPUT_NAME "emos"
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
-+  LIBS        grib_api_f90 grib_api_f77 grib_api
++  LIBS        eccodes_f90 eccodes
 +  SOURCES     ../libemos_version.c ${emos_sp_shared_srcs}
 +  GENERATED   ../libemos_version.c )
 Index: emoslib-4.4.5/libemos-dp-shared/CMakeLists.txt
@@ -58,7 +58,7 @@ Index: emoslib-4.4.5/libemos-dp-shared/CMakeLists.txt
 +  VERSION     0d
 +  OUTPUT_NAME "emosR64"
 +  DEFINITIONS ${LIBEMOS_DEFINITIONS}
-+  LIBS        grib_api_f90 grib_api_f77 grib_api
++  LIBS        eccodes_f90 eccodes
 +  SOURCES     ../libemos_version.c ${emos_dp_shared_srcs}
 +  GENERATED   ../libemos_version.c )
 +

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