[magics] 57/63: Donet define HAVE_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 magics.

commit 9c3c86089c4e018c73bcbb17ef1a2a993a04b98e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Dec 7 16:57:14 2016 +0000

    Donet define HAVE_LIBGRIB_API
---
 debian/patches/python3.patch | 20 ++++++++++++++++++--
 debian/rules                 |  1 -
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 95af15b..0eb0247 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1827,11 +1827,14 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
 ===================================================================
 --- magics++-2.30.0.orig/python/Magics/toolbox.py
 +++ magics++-2.30.0/python/Magics/toolbox.py
-@@ -1,3 +1,4 @@
+@@ -1,5 +1,6 @@
 +from __future__ import print_function
  
- import macro
+-import macro
++from . import macro
  
+ def substitute(default, user):
+     out = default
 @@ -7,7 +8,7 @@ def substitute(default, user):
          for key in user:
              out[key] = user[key]
@@ -1863,6 +1866,19 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
      	clim = macro.mwrepjson(
                              wrepjson_family =  "eps",
                              wrepjson_keyword =  "clim",
+@@ -239,10 +240,10 @@ def epsgram(parameter, input, **args):
+ 
+ def epsclimgram(**kw):
+ 
+-	print kw
++	print (kw)
+ 	args = {"clim" :True }
+ 	args.update(kw)
+-	print args
++	print (args)
+ 
+ 	return epsgram(**args)
+ 
 Index: magics++-2.30.0/utils/epsgrams.py
 ===================================================================
 --- magics++-2.30.0.orig/utils/epsgrams.py
diff --git a/debian/rules b/debian/rules
index 6136583..68d54e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ export extra_flags +=  \
 	-DHAVE_DLFCN_H=1 \
 	-DHAVE_INTTYPES_H=1 \
 	-DHAVE_LIBEXPAT=1 \
-	-DHAVE_LIBGRIB_API=1 \
 	-DHAVE_LIBPROJ=1 \
 	-DHAVE_LIBPTHREAD=1 \
 	-DHAVE_LIBZ=1 \

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