[eccodes] 05/13: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 10:55:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/2.5.0-2
in repository eccodes.
commit 550c23854123b1312a7d3949c6e32d7456339adc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Oct 4 09:58:32 2017 +0100
refresh patches
---
debian/patches/memfs.patch | 10 +++---
debian/patches/numpy-fixes.patch | 6 ++--
debian/patches/py3-fixes.patch | 30 ++++++++---------
debian/patches/python3.patch | 73 ++++++++++++----------------------------
debian/patches/remove-rpms.patch | 6 ++--
debian/patches/static-fix.patch | 60 ++++++++++++++++-----------------
6 files changed, 77 insertions(+), 108 deletions(-)
diff --git a/debian/patches/memfs.patch b/debian/patches/memfs.patch
index 2691674..71e452e 100644
--- a/debian/patches/memfs.patch
+++ b/debian/patches/memfs.patch
@@ -1,9 +1,9 @@
-Index: eccodes-2.4.1/memfs/CMakeLists.txt
+Index: eccodes-2.5.0/memfs/CMakeLists.txt
===================================================================
---- eccodes-2.4.1.orig/memfs/CMakeLists.txt
-+++ eccodes-2.4.1/memfs/CMakeLists.txt
-@@ -13,7 +13,17 @@ set_source_files_properties( ${CMAKE_CUR
- )
+--- eccodes-2.5.0.orig/memfs/CMakeLists.txt
++++ eccodes-2.5.0/memfs/CMakeLists.txt
+@@ -19,7 +19,17 @@ if( CMAKE_C_COMPILER_ID MATCHES Cray )
+ endif()
if (HAVE_MEMFS)
- ecbuild_add_library(TARGET eccodes_memfs
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index 2618bb3..0c8a204 100644
--- a/debian/patches/numpy-fixes.patch
+++ b/debian/patches/numpy-fixes.patch
@@ -4,10 +4,10 @@ Description: Update the numpy.i from a copy in numpy.git to add
Last-Updated: 2016-06-12
Forwarded: no
-Index: eccodes-2.4.1/python/numpy.i
+Index: eccodes-2.5.0/python/numpy.i
===================================================================
---- eccodes-2.4.1.orig/python/numpy.i
-+++ eccodes-2.4.1/python/numpy.i
+--- eccodes-2.5.0.orig/python/numpy.i
++++ eccodes-2.5.0/python/numpy.i
@@ -1,11 +1,46 @@
/* -*- C -*- (not really, but good for syntax highlighting) */
+
diff --git a/debian/patches/py3-fixes.patch b/debian/patches/py3-fixes.patch
index bed1ada..e22fa92 100644
--- a/debian/patches/py3-fixes.patch
+++ b/debian/patches/py3-fixes.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.4.1/python/CMakeLists.txt
+Index: eccodes-2.5.0/python/CMakeLists.txt
===================================================================
---- eccodes-2.4.1.orig/python/CMakeLists.txt
-+++ eccodes-2.4.1/python/CMakeLists.txt
+--- eccodes-2.5.0.orig/python/CMakeLists.txt
++++ eccodes-2.5.0/python/CMakeLists.txt
@@ -1,9 +1,9 @@
if( HAVE_PYTHON )
@@ -16,10 +16,10 @@ Index: eccodes-2.4.1/python/CMakeLists.txt
# preparing for generating setup.py
if( HAVE_LIBJASPER )
-Index: eccodes-2.4.1/python/gribapi_swig.i
+Index: eccodes-2.5.0/python/gribapi_swig.i
===================================================================
---- eccodes-2.4.1.orig/python/gribapi_swig.i
-+++ eccodes-2.4.1/python/gribapi_swig.i
+--- eccodes-2.5.0.orig/python/gribapi_swig.i
++++ eccodes-2.5.0/python/gribapi_swig.i
@@ -17,14 +17,17 @@
import_array();
%}
@@ -64,10 +64,10 @@ Index: eccodes-2.4.1/python/gribapi_swig.i
int grib_c_multi_support_off(void);
int grib_c_multi_release(int* gid);
int grib_c_multi_append(int* INPUT, int* INPUT,int* INPUT);
-Index: eccodes-2.4.1/python/eccodes/high_level/codesfile.py
+Index: eccodes-2.5.0/python/eccodes/high_level/codesfile.py
===================================================================
---- eccodes-2.4.1.orig/python/eccodes/high_level/codesfile.py
-+++ eccodes-2.4.1/python/eccodes/high_level/codesfile.py
+--- eccodes-2.5.0.orig/python/eccodes/high_level/codesfile.py
++++ eccodes-2.5.0/python/eccodes/high_level/codesfile.py
@@ -6,9 +6,9 @@ Author: Daniel Lee, DWD, 2016
"""
@@ -80,10 +80,10 @@ Index: eccodes-2.4.1/python/eccodes/high_level/codesfile.py
"""
An abstract class to specify and/or implement common behaviour that files
-Index: eccodes-2.4.1/python/gribapi/gribapi.py
+Index: eccodes-2.5.0/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.4.1.orig/python/gribapi/gribapi.py
-+++ eccodes-2.4.1/python/gribapi/gribapi.py
+--- eccodes-2.5.0.orig/python/gribapi/gribapi.py
++++ eccodes-2.5.0/python/gribapi/gribapi.py
@@ -22,15 +22,15 @@ When this is enabed, then the system Pyt
- NumPy
@@ -103,10 +103,10 @@ Index: eccodes-2.4.1/python/gribapi/gribapi.py
try:
type(file)
-Index: eccodes-2.4.1/python/gribapi/errors.py
+Index: eccodes-2.5.0/python/gribapi/errors.py
===================================================================
---- eccodes-2.4.1.orig/python/gribapi/errors.py
-+++ eccodes-2.4.1/python/gribapi/errors.py
+--- eccodes-2.5.0.orig/python/gribapi/errors.py
++++ eccodes-2.5.0/python/gribapi/errors.py
@@ -2,7 +2,7 @@
Exception class hierarchy
"""
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index fea76cf..c0498f0 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Support for Python3
Forwarded: no
Last-Updated: 2016-12-05
-Index: eccodes-2.4.1/python/test_iterator.py
+Index: eccodes-2.5.0/python/test_iterator.py
===================================================================
---- eccodes-2.4.1.orig/python/test_iterator.py
-+++ eccodes-2.4.1/python/test_iterator.py
+--- eccodes-2.5.0.orig/python/test_iterator.py
++++ eccodes-2.5.0/python/test_iterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -33,10 +33,10 @@ Index: eccodes-2.4.1/python/test_iterator.py
grib_iterator_delete(iterid)
grib_release(gid)
-Index: eccodes-2.4.1/python/test_index.py
+Index: eccodes-2.5.0/python/test_index.py
===================================================================
---- eccodes-2.4.1.orig/python/test_index.py
-+++ eccodes-2.4.1/python/test_index.py
+--- eccodes-2.5.0.orig/python/test_index.py
++++ eccodes-2.5.0/python/test_index.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -113,10 +113,10 @@ Index: eccodes-2.4.1/python/test_index.py
main()
- #print "------------------------------------"
+ #print ("------------------------------------")
-Index: eccodes-2.4.1/python/test_keysiterator.py
+Index: eccodes-2.5.0/python/test_keysiterator.py
===================================================================
---- eccodes-2.4.1.orig/python/test_keysiterator.py
-+++ eccodes-2.4.1/python/test_keysiterator.py
+--- eccodes-2.5.0.orig/python/test_keysiterator.py
++++ eccodes-2.5.0/python/test_keysiterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -140,10 +140,10 @@ Index: eccodes-2.4.1/python/test_keysiterator.py
fid.close()
-
-
-Index: eccodes-2.4.1/python/test_general.py
+Index: eccodes-2.5.0/python/test_general.py
===================================================================
---- eccodes-2.4.1.orig/python/test_general.py
-+++ eccodes-2.4.1/python/test_general.py
+--- eccodes-2.5.0.orig/python/test_general.py
++++ eccodes-2.5.0/python/test_general.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -305,10 +305,10 @@ Index: eccodes-2.4.1/python/test_general.py
main()
- print "------------------------------------"
+ print ("------------------------------------")
-Index: eccodes-2.4.1/python/test_extra.py
+Index: eccodes-2.5.0/python/test_extra.py
===================================================================
---- eccodes-2.4.1.orig/python/test_extra.py
-+++ eccodes-2.4.1/python/test_extra.py
+--- eccodes-2.5.0.orig/python/test_extra.py
++++ eccodes-2.5.0/python/test_extra.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
@@ -360,10 +360,10 @@ Index: eccodes-2.4.1/python/test_extra.py
grib_write(gid,oid)
-Index: eccodes-2.4.1/examples/python/keys_iterator_gts.py
+Index: eccodes-2.5.0/examples/python/binary_message.py
===================================================================
---- eccodes-2.4.1.orig/examples/python/keys_iterator_gts.py
-+++ eccodes-2.4.1/examples/python/keys_iterator_gts.py
+--- eccodes-2.5.0.orig/examples/python/binary_message.py
++++ eccodes-2.5.0/examples/python/binary_message.py
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -372,41 +372,10 @@ Index: eccodes-2.4.1/examples/python/keys_iterator_gts.py
import traceback
import sys
-@@ -36,7 +37,7 @@ def example():
- while codes_keys_iterator_next(iterid):
- keyname = codes_keys_iterator_get_name(iterid)
- keyval = codes_get_string(iterid, keyname)
-- print "%s = %s" % (keyname, keyval)
-+ print ("%s = %s" % (keyname, keyval))
-
- codes_keys_iterator_delete(iterid)
- codes_release(bid)
-@@ -51,7 +52,8 @@ def main():
- if VERBOSE:
- traceback.print_exc(file=sys.stderr)
- else:
-- print >> sys.stderr, err.msg
-+ print(err.msg, file=sys.stderr)
-+
-
- return 1
-
-Index: eccodes-2.4.1/examples/python/binary_message.py
-===================================================================
---- eccodes-2.4.1.orig/examples/python/binary_message.py
-+++ eccodes-2.4.1/examples/python/binary_message.py
-@@ -9,6 +9,7 @@
- # nor does it submit to any jurisdiction.
- #
-
-+from __future__ import print_function
- import traceback
- import sys
-
-Index: eccodes-2.4.1/python/gribapi/gribapi.py
+Index: eccodes-2.5.0/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.4.1.orig/python/gribapi/gribapi.py
-+++ eccodes-2.4.1/python/gribapi/gribapi.py
+--- eccodes-2.5.0.orig/python/gribapi/gribapi.py
++++ eccodes-2.5.0/python/gribapi/gribapi.py
@@ -23,7 +23,7 @@ When this is enabed, then the system Pyt
"""
diff --git a/debian/patches/remove-rpms.patch b/debian/patches/remove-rpms.patch
index b9a2d58..117f2bb 100644
--- a/debian/patches/remove-rpms.patch
+++ b/debian/patches/remove-rpms.patch
@@ -3,10 +3,10 @@ Description: Drop refs to files that don't exist
Last-Updated: 2016-10-27
Forwarded: no
-Index: eccodes-2.4.1/configure.ac
+Index: eccodes-2.5.0/configure.ac
===================================================================
---- eccodes-2.4.1.orig/configure.ac
-+++ eccodes-2.4.1/configure.ac
+--- eccodes-2.5.0.orig/configure.ac
++++ eccodes-2.5.0/configure.ac
@@ -39,7 +39,7 @@ AM_SANITY_CHECK
AC_CONFIG_SRCDIR([src/grib_api.h])
AC_CONFIG_HEADER([src/config.h])
diff --git a/debian/patches/static-fix.patch b/debian/patches/static-fix.patch
index 65406e8..08fd2d1 100644
--- a/debian/patches/static-fix.patch
+++ b/debian/patches/static-fix.patch
@@ -6,10 +6,10 @@ Bug-Upstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752732
Last-Updated: 2016-10-27
Forwarded: no
-Index: eccodes-2.4.1/tools/mars_request.c
+Index: eccodes-2.5.0/tools/mars_request.c
===================================================================
---- eccodes-2.4.1.orig/tools/mars_request.c
-+++ eccodes-2.4.1/tools/mars_request.c
+--- eccodes-2.5.0.orig/tools/mars_request.c
++++ eccodes-2.5.0/tools/mars_request.c
@@ -13,7 +13,7 @@
#include "grib_api.h"
@@ -19,10 +19,10 @@ Index: eccodes-2.4.1/tools/mars_request.c
{
fprintf(stderr,"%s: file\n",prog);
exit(1);
-Index: eccodes-2.4.1/tools/gaussian.c
+Index: eccodes-2.5.0/tools/gaussian.c
===================================================================
---- eccodes-2.4.1.orig/tools/gaussian.c
-+++ eccodes-2.4.1/tools/gaussian.c
+--- eccodes-2.5.0.orig/tools/gaussian.c
++++ eccodes-2.5.0/tools/gaussian.c
@@ -14,7 +14,7 @@
#include "grib_api.h"
@@ -32,10 +32,10 @@ Index: eccodes-2.4.1/tools/gaussian.c
{
fprintf(stderr,"%s: N\n",prog);
exit(1);
-Index: eccodes-2.4.1/tools/grib_check_gaussian_grid.c
+Index: eccodes-2.5.0/tools/grib_check_gaussian_grid.c
===================================================================
---- eccodes-2.4.1.orig/tools/grib_check_gaussian_grid.c
-+++ eccodes-2.4.1/tools/grib_check_gaussian_grid.c
+--- eccodes-2.5.0.orig/tools/grib_check_gaussian_grid.c
++++ eccodes-2.5.0/tools/grib_check_gaussian_grid.c
@@ -30,7 +30,7 @@ int DBL_EQUAL(double d1, double d2, doub
return fabs(d1-d2) <= tolerance;
}
@@ -45,10 +45,10 @@ Index: eccodes-2.4.1/tools/grib_check_gaussian_grid.c
{
printf("usage: %s [-f] grib_file grib_file ...\n\n",prog);
printf("Check geometry of GRIB fields with a Gaussian Grid.\n");
-Index: eccodes-2.4.1/tools/grib_nearest_land.c
+Index: eccodes-2.5.0/tools/grib_nearest_land.c
===================================================================
---- eccodes-2.4.1.orig/tools/grib_nearest_land.c
-+++ eccodes-2.4.1/tools/grib_nearest_land.c
+--- eccodes-2.5.0.orig/tools/grib_nearest_land.c
++++ eccodes-2.5.0/tools/grib_nearest_land.c
@@ -19,7 +19,7 @@
#include "grib_api_internal.h"
@@ -58,10 +58,10 @@ Index: eccodes-2.4.1/tools/grib_nearest_land.c
printf("Usage: %s latlon_file grib_orography grib_file grib_file ...\n",prog);
exit(1);
}
-Index: eccodes-2.4.1/tools/grib_tools.h
+Index: eccodes-2.5.0/tools/grib_tools.h
===================================================================
---- eccodes-2.4.1.orig/tools/grib_tools.h
-+++ eccodes-2.4.1/tools/grib_tools.h
+--- eccodes-2.5.0.orig/tools/grib_tools.h
++++ eccodes-2.5.0/tools/grib_tools.h
@@ -181,7 +181,7 @@ int grib_tool(int argc, char **argv);
char* grib_options_get_help(char* id);
char* grib_options_get_args(char* id);
@@ -71,10 +71,10 @@ Index: eccodes-2.4.1/tools/grib_tools.h
void usage_doxygen();
int grib_tool_before_getopt(grib_runtime_options* options);
int grib_tool_init(grib_runtime_options* options);
-Index: eccodes-2.4.1/tools/grib_compare.c
+Index: eccodes-2.5.0/tools/grib_compare.c
===================================================================
---- eccodes-2.4.1.orig/tools/grib_compare.c
-+++ eccodes-2.4.1/tools/grib_compare.c
+--- eccodes-2.5.0.orig/tools/grib_compare.c
++++ eccodes-2.5.0/tools/grib_compare.c
@@ -289,7 +289,7 @@ int grib_tool_init(grib_runtime_options*
options->tolerance_count=MAX_KEYS;
ret=parse_keyval_string(grib_tool_name, sarg,1,GRIB_TYPE_DOUBLE,options->tolerance,&(options->tolerance_count));
@@ -84,10 +84,10 @@ Index: eccodes-2.4.1/tools/grib_compare.c
exit(1);
}
}
-Index: eccodes-2.4.1/tools/grib_options.c
+Index: eccodes-2.5.0/tools/grib_options.c
===================================================================
---- eccodes-2.4.1.orig/tools/grib_options.c
-+++ eccodes-2.4.1/tools/grib_options.c
+--- eccodes-2.5.0.orig/tools/grib_options.c
++++ eccodes-2.5.0/tools/grib_options.c
@@ -112,7 +112,7 @@ grib_options_help grib_options_help_list
int grib_options_help_count=sizeof(grib_options_help_list)/sizeof(grib_options_help);
@@ -159,11 +159,11 @@ Index: eccodes-2.4.1/tools/grib_options.c
return GRIB_SUCCESS;
}
-Index: eccodes-2.4.1/tools/grib_to_netcdf.c
+Index: eccodes-2.5.0/tools/grib_to_netcdf.c
===================================================================
---- eccodes-2.4.1.orig/tools/grib_to_netcdf.c
-+++ eccodes-2.4.1/tools/grib_to_netcdf.c
-@@ -3973,7 +3973,7 @@ int grib_tool_init(grib_runtime_options*
+--- eccodes-2.5.0.orig/tools/grib_to_netcdf.c
++++ eccodes-2.5.0/tools/grib_to_netcdf.c
+@@ -4016,7 +4016,7 @@ int grib_tool_init(grib_runtime_options*
}
if (kvalue->name == NULL) {
fprintf(stderr, "Invalid format: %s", kind_name);
@@ -172,7 +172,7 @@ Index: eccodes-2.4.1/tools/grib_to_netcdf.c
exit(1);
}
}
-@@ -3983,7 +3983,7 @@ int grib_tool_init(grib_runtime_options*
+@@ -4063,7 +4063,7 @@ int grib_tool_init(grib_runtime_options*
char* theArg = grib_options_get_option("R:");
if (!is_number(theArg)) {
fprintf(stderr, "Invalid reference date: %s\n", theArg);
@@ -181,7 +181,7 @@ Index: eccodes-2.4.1/tools/grib_to_netcdf.c
exit(1);
}
set_value(user_r, "referencedate", theArg);
-@@ -4162,7 +4162,7 @@ int grib_tool_finalise_action(grib_runti
+@@ -4242,7 +4242,7 @@ int grib_tool_finalise_action(grib_runti
if(options->outfile==NULL || options->outfile->name==NULL)
{
@@ -190,10 +190,10 @@ Index: eccodes-2.4.1/tools/grib_to_netcdf.c
exit(1);
}
-Index: eccodes-2.4.1/tools/bufr_compare.c
+Index: eccodes-2.5.0/tools/bufr_compare.c
===================================================================
---- eccodes-2.4.1.orig/tools/bufr_compare.c
-+++ eccodes-2.4.1/tools/bufr_compare.c
+--- eccodes-2.5.0.orig/tools/bufr_compare.c
++++ eccodes-2.5.0/tools/bufr_compare.c
@@ -349,7 +349,7 @@ int grib_tool_init(grib_runtime_options*
options->tolerance_count=MAX_KEYS;
ret=parse_keyval_string(grib_tool_name, sarg,1,GRIB_TYPE_DOUBLE,options->tolerance,&(options->tolerance_count));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eccodes.git
More information about the debian-science-commits
mailing list