[flexpart] 02/05: Build against eccodes instead of gribapi

[Alastair McKinstry]

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

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

commit 4e235772f6138b2d7309cb32e764be7c793752b6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Dec 7 07:02:54 2016 +0000

    Build against eccodes instead of gribapi
---
 debian/changelog             |  1 +
 debian/control               |  2 +-
 debian/patches/eccodes.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1d42c52..78c27cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 flexpart (9.02-14) UNRELEASED; urgency=medium
 
   * Move to debhelper 10.
+  * Build against eccodes instead of gribapi
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 07 Dec 2016 07:01:35 +0000
 
diff --git a/debian/control b/debian/control
index 38bd6ea..488d1cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 10), 
         gfortran (>= 4:5.2.1), 
-        libgrib-api-dev (>= 1.13.1-3)
+        libeccodes-dev
 Standards-Version: 3.9.8
 Homepage: http://transport.nilu.no/flexpart
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/flexpart.git
diff --git a/debian/patches/eccodes.patch b/debian/patches/eccodes.patch
new file mode 100644
index 0000000..0566cf7
--- /dev/null
+++ b/debian/patches/eccodes.patch
@@ -0,0 +1,31 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Link against eccodes not grib_api (eccodes replacing grib_api at ECMWF)
+Last-Updated: 2016-12-07
+Forwarded: no
+
+Index: flexpart-9.02/makefile.gfs_gfortran
+===================================================================
+--- flexpart-9.02.orig/makefile.gfs_gfortran
++++ flexpart-9.02/makefile.gfs_gfortran
+@@ -8,7 +8,7 @@ INCPATH  = /usr/include
+ LIBPATH1 = /usr/lib
+ LIBPATH2 = 
+ FFLAGS   = -O2 $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+-LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed  -lgrib_api_f90 -lgrib_api -lm
++LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed  -leccodes_f90 -leccodes -lm
+ #
+ 
+ MODOBJS = \
+Index: flexpart-9.02/makefile.ecmwf_gfortran
+===================================================================
+--- flexpart-9.02.orig/makefile.ecmwf_gfortran
++++ flexpart-9.02/makefile.ecmwf_gfortran
+@@ -7,7 +7,7 @@ INCPATH  = /usr/include
+ LIBPATH1 = /usr/lib
+ LIBPATH2 = 
+ FFLAGS   = $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+-LFLAGS  = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm
++LFLAGS  = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -leccodes_f90 -leccodes -lm
+ MODPATH = /usr/include
+ #
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a97fd00..7cac19b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fortran.patch
 mcmodel.patch
+eccodes.patch

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