[eccodes] 87/106: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 09:05:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository eccodes.
commit cdf90921181046f98f29665d01a034ad6f187988
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu May 25 09:14:28 2017 +0100
refresh patches
---
debian/patches/disable-download-tests.patch | 35 +++++++------
debian/patches/numpy-fixes.patch | 6 +--
debian/patches/py3-fixes.patch | 16 +++---
debian/patches/python3.patch | 48 +++++++++---------
debian/patches/remove-rpms.patch | 6 +--
debian/patches/static-fix.patch | 76 ++++++++++++++---------------
6 files changed, 97 insertions(+), 90 deletions(-)
diff --git a/debian/patches/disable-download-tests.patch b/debian/patches/disable-download-tests.patch
index 304d07f..18bb280 100644
--- a/debian/patches/disable-download-tests.patch
+++ b/debian/patches/disable-download-tests.patch
@@ -3,11 +3,11 @@ Description: Disable downloading grib files; already present
Last-Updated: 2016-10-27
Forwarded: not-needed
-Index: eccodes-2.1.0/tests/CMakeLists.txt
+Index: eccodes-2.3.0/tests/CMakeLists.txt
===================================================================
---- eccodes-2.1.0.orig/tests/CMakeLists.txt
-+++ eccodes-2.1.0/tests/CMakeLists.txt
-@@ -152,8 +152,8 @@ foreach( test ${tests_data_reqd} )
+--- eccodes-2.3.0.orig/tests/CMakeLists.txt
++++ eccodes-2.3.0/tests/CMakeLists.txt
+@@ -154,8 +154,8 @@ foreach( test ${tests_data_reqd} )
TYPE SCRIPT
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
RESOURCES asca_139.t1.ref
@@ -18,7 +18,7 @@ Index: eccodes-2.1.0/tests/CMakeLists.txt
)
endforeach()
-@@ -172,7 +172,7 @@ if( HAVE_PYTHON AND ENABLE_EXTRA_TESTS )
+@@ -174,7 +174,7 @@ if( HAVE_PYTHON AND ENABLE_EXTRA_TESTS )
TYPE SCRIPT
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE} PYTHONPATH=${PROJECT_BINARY_DIR}/python
@@ -27,7 +27,7 @@ Index: eccodes-2.1.0/tests/CMakeLists.txt
)
endforeach()
endif()
-@@ -183,7 +183,7 @@ ecbuild_add_test( TARGET eccodes_t_lamb_
+@@ -185,7 +185,7 @@ ecbuild_add_test( TARGET eccodes_t_lamb_
TYPE SCRIPT
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lamb_az_eq_area.sh
RESOURCES lamb_az_eq_area.ref
@@ -36,7 +36,7 @@ Index: eccodes-2.1.0/tests/CMakeLists.txt
)
# These ones are conditional
-@@ -192,28 +192,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
+@@ -194,28 +194,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
TYPE SCRIPT
CONDITION HAVE_NETCDF
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
@@ -44,10 +44,10 @@ Index: eccodes-2.1.0/tests/CMakeLists.txt
+ # TEST_DEPENDS eccodes_download_gribs
)
- ecbuild_add_test( TARGET eccodes_t_jpeg
+ ecbuild_add_test( TARGET eccodes_t_grib_jpeg
TYPE SCRIPT
CONDITION HAVE_JPEG
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jpeg.sh
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_jpeg.sh
- TEST_DEPENDS eccodes_download_gribs
+ # TEST_DEPENDS eccodes_download_gribs
)
@@ -60,19 +60,26 @@ Index: eccodes-2.1.0/tests/CMakeLists.txt
+ # TEST_DEPENDS eccodes_download_gribs
)
- ecbuild_add_test( TARGET eccodes_t_ccsds
+ ecbuild_add_test( TARGET eccodes_t_grib_ccsds
TYPE SCRIPT
CONDITION HAVE_AEC
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ccsds.sh
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_ccsds.sh
- TEST_DEPENDS eccodes_download_gribs
+ # TEST_DEPENDS eccodes_download_gribs
)
ecbuild_add_test( TARGET eccodes_t_grib_check_param_concepts
-Index: eccodes-2.1.0/cmake/ecbuild_get_test_data.cmake
+@@ -228,5 +228,5 @@ ecbuild_add_test( TARGET eccodes_t_ecc-3
+ TYPE SCRIPT
+ CONDITION ENABLE_EXTRA_TESTS AND ENABLE_GRIB_TIMER
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ecc-386.sh
+- TEST_DEPENDS eccodes_download_gribs
++ # TEST_DEPENDS eccodes_download_gribs
+ )
+Index: eccodes-2.3.0/cmake/ecbuild_get_test_data.cmake
===================================================================
---- eccodes-2.1.0.orig/cmake/ecbuild_get_test_data.cmake
-+++ eccodes-2.1.0/cmake/ecbuild_get_test_data.cmake
+--- eccodes-2.3.0.orig/cmake/ecbuild_get_test_data.cmake
++++ eccodes-2.3.0/cmake/ecbuild_get_test_data.cmake
@@ -178,7 +178,7 @@ function( ecbuild_get_test_data )
# download the data
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index 2757e31..fcd25ec 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.1.0/python/numpy.i
+Index: eccodes-2.3.0/python/numpy.i
===================================================================
---- eccodes-2.1.0.orig/python/numpy.i
-+++ eccodes-2.1.0/python/numpy.i
+--- eccodes-2.3.0.orig/python/numpy.i
++++ eccodes-2.3.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 aa7174d..0155dd6 100644
--- a/debian/patches/py3-fixes.patch
+++ b/debian/patches/py3-fixes.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.1.0/python/CMakeLists.txt
+Index: eccodes-2.3.0/python/CMakeLists.txt
===================================================================
---- eccodes-2.1.0.orig/python/CMakeLists.txt
-+++ eccodes-2.1.0/python/CMakeLists.txt
+--- eccodes-2.3.0.orig/python/CMakeLists.txt
++++ eccodes-2.3.0/python/CMakeLists.txt
@@ -1,9 +1,9 @@
if( HAVE_PYTHON )
@@ -16,10 +16,10 @@ Index: eccodes-2.1.0/python/CMakeLists.txt
# preparing for generating setup.py
if( HAVE_LIBJASPER )
-Index: eccodes-2.1.0/python/gribapi_swig.i
+Index: eccodes-2.3.0/python/gribapi_swig.i
===================================================================
---- eccodes-2.1.0.orig/python/gribapi_swig.i
-+++ eccodes-2.1.0/python/gribapi_swig.i
+--- eccodes-2.3.0.orig/python/gribapi_swig.i
++++ eccodes-2.3.0/python/gribapi_swig.i
@@ -17,14 +17,17 @@
import_array();
%}
@@ -45,7 +45,7 @@ Index: eccodes-2.1.0/python/gribapi_swig.i
}
%pointer_class(int, intp);
-@@ -66,6 +69,7 @@ int grib_c_count_in_file(FILE* f,int* OU
+@@ -67,6 +70,7 @@ int grib_c_count_in_file(FILE* f,int* OU
// grib handle operations
int grib_c_release(int* gid);
int grib_c_write(int* gid, FILE* f);
@@ -53,7 +53,7 @@ Index: eccodes-2.1.0/python/gribapi_swig.i
int grib_c_get_size_long(int* gid, char* key, long* OUTPUT);
int grib_c_get_string_length(int* gid, char* key, size_t* OUTPUT);
int grib_c_clone(int* gid,int* INOUT);
-@@ -76,9 +80,9 @@ int grib_c_get_native_type(int* gid, cha
+@@ -77,9 +81,9 @@ int grib_c_get_native_type(int* gid, cha
// ---
// multi support
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 38907ef..dc03c23 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.1.0/python/test_iterator.py
+Index: eccodes-2.3.0/python/test_iterator.py
===================================================================
---- eccodes-2.1.0.orig/python/test_iterator.py
-+++ eccodes-2.1.0/python/test_iterator.py
+--- eccodes-2.3.0.orig/python/test_iterator.py
++++ eccodes-2.3.0/python/test_iterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -33,10 +33,10 @@ Index: eccodes-2.1.0/python/test_iterator.py
grib_iterator_delete(iterid)
grib_release(gid)
-Index: eccodes-2.1.0/python/test_index.py
+Index: eccodes-2.3.0/python/test_index.py
===================================================================
---- eccodes-2.1.0.orig/python/test_index.py
-+++ eccodes-2.1.0/python/test_index.py
+--- eccodes-2.3.0.orig/python/test_index.py
++++ eccodes-2.3.0/python/test_index.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -113,10 +113,10 @@ Index: eccodes-2.1.0/python/test_index.py
main()
- #print "------------------------------------"
+ #print ("------------------------------------")
-Index: eccodes-2.1.0/python/test_keysiterator.py
+Index: eccodes-2.3.0/python/test_keysiterator.py
===================================================================
---- eccodes-2.1.0.orig/python/test_keysiterator.py
-+++ eccodes-2.1.0/python/test_keysiterator.py
+--- eccodes-2.3.0.orig/python/test_keysiterator.py
++++ eccodes-2.3.0/python/test_keysiterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -140,10 +140,10 @@ Index: eccodes-2.1.0/python/test_keysiterator.py
fid.close()
-
-
-Index: eccodes-2.1.0/python/test_general.py
+Index: eccodes-2.3.0/python/test_general.py
===================================================================
---- eccodes-2.1.0.orig/python/test_general.py
-+++ eccodes-2.1.0/python/test_general.py
+--- eccodes-2.3.0.orig/python/test_general.py
++++ eccodes-2.3.0/python/test_general.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -305,10 +305,10 @@ Index: eccodes-2.1.0/python/test_general.py
main()
- print "------------------------------------"
+ print ("------------------------------------")
-Index: eccodes-2.1.0/python/test_extra.py
+Index: eccodes-2.3.0/python/test_extra.py
===================================================================
---- eccodes-2.1.0.orig/python/test_extra.py
-+++ eccodes-2.1.0/python/test_extra.py
+--- eccodes-2.3.0.orig/python/test_extra.py
++++ eccodes-2.3.0/python/test_extra.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
@@ -360,10 +360,10 @@ Index: eccodes-2.1.0/python/test_extra.py
grib_write(gid,oid)
-Index: eccodes-2.1.0/examples/python/keys_iterator_gts.py
+Index: eccodes-2.3.0/examples/python/keys_iterator_gts.py
===================================================================
---- eccodes-2.1.0.orig/examples/python/keys_iterator_gts.py
-+++ eccodes-2.1.0/examples/python/keys_iterator_gts.py
+--- eccodes-2.3.0.orig/examples/python/keys_iterator_gts.py
++++ eccodes-2.3.0/examples/python/keys_iterator_gts.py
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -391,10 +391,10 @@ Index: eccodes-2.1.0/examples/python/keys_iterator_gts.py
return 1
-Index: eccodes-2.1.0/examples/python/binary_message.py
+Index: eccodes-2.3.0/examples/python/binary_message.py
===================================================================
---- eccodes-2.1.0.orig/examples/python/binary_message.py
-+++ eccodes-2.1.0/examples/python/binary_message.py
+--- eccodes-2.3.0.orig/examples/python/binary_message.py
++++ eccodes-2.3.0/examples/python/binary_message.py
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -403,10 +403,10 @@ Index: eccodes-2.1.0/examples/python/binary_message.py
import traceback
import sys
-Index: eccodes-2.1.0/python/gribapi/gribapi.py
+Index: eccodes-2.3.0/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.1.0.orig/python/gribapi/gribapi.py
-+++ eccodes-2.1.0/python/gribapi/gribapi.py
+--- eccodes-2.3.0.orig/python/gribapi/gribapi.py
++++ eccodes-2.3.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 6d1fda5..ffbadab 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.1.0/configure.ac
+Index: eccodes-2.3.0/configure.ac
===================================================================
---- eccodes-2.1.0.orig/configure.ac
-+++ eccodes-2.1.0/configure.ac
+--- eccodes-2.3.0.orig/configure.ac
++++ eccodes-2.3.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 9d5d468..52aecdb 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.1.0/tools/mars_request.c
+Index: eccodes-2.3.0/tools/mars_request.c
===================================================================
---- eccodes-2.1.0.orig/tools/mars_request.c
-+++ eccodes-2.1.0/tools/mars_request.c
+--- eccodes-2.3.0.orig/tools/mars_request.c
++++ eccodes-2.3.0/tools/mars_request.c
@@ -13,7 +13,7 @@
#include "grib_api.h"
@@ -19,10 +19,10 @@ Index: eccodes-2.1.0/tools/mars_request.c
{
fprintf(stderr,"%s: file\n",prog);
exit(1);
-Index: eccodes-2.1.0/tools/gaussian.c
+Index: eccodes-2.3.0/tools/gaussian.c
===================================================================
---- eccodes-2.1.0.orig/tools/gaussian.c
-+++ eccodes-2.1.0/tools/gaussian.c
+--- eccodes-2.3.0.orig/tools/gaussian.c
++++ eccodes-2.3.0/tools/gaussian.c
@@ -14,7 +14,7 @@
#include "grib_api.h"
@@ -32,10 +32,10 @@ Index: eccodes-2.1.0/tools/gaussian.c
{
fprintf(stderr,"%s: N\n",prog);
exit(1);
-Index: eccodes-2.1.0/tools/grib_check_gaussian_grid.c
+Index: eccodes-2.3.0/tools/grib_check_gaussian_grid.c
===================================================================
---- eccodes-2.1.0.orig/tools/grib_check_gaussian_grid.c
-+++ eccodes-2.1.0/tools/grib_check_gaussian_grid.c
+--- eccodes-2.3.0.orig/tools/grib_check_gaussian_grid.c
++++ eccodes-2.3.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.1.0/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.1.0/tools/grib_nearest_land.c
+Index: eccodes-2.3.0/tools/grib_nearest_land.c
===================================================================
---- eccodes-2.1.0.orig/tools/grib_nearest_land.c
-+++ eccodes-2.1.0/tools/grib_nearest_land.c
+--- eccodes-2.3.0.orig/tools/grib_nearest_land.c
++++ eccodes-2.3.0/tools/grib_nearest_land.c
@@ -19,7 +19,7 @@
#include "grib_api_internal.h"
@@ -58,11 +58,11 @@ Index: eccodes-2.1.0/tools/grib_nearest_land.c
printf("Usage: %s latlon_file grib_orography grib_file grib_file ...\n",prog);
exit(1);
}
-Index: eccodes-2.1.0/tools/grib_tools.h
+Index: eccodes-2.3.0/tools/grib_tools.h
===================================================================
---- eccodes-2.1.0.orig/tools/grib_tools.h
-+++ eccodes-2.1.0/tools/grib_tools.h
-@@ -183,7 +183,7 @@ int grib_tool(int argc, char **argv);
+--- eccodes-2.3.0.orig/tools/grib_tools.h
++++ eccodes-2.3.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);
int grib_options_command_line(const char* id);
@@ -71,10 +71,10 @@ Index: eccodes-2.1.0/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.1.0/tools/grib_compare.c
+Index: eccodes-2.3.0/tools/grib_compare.c
===================================================================
---- eccodes-2.1.0.orig/tools/grib_compare.c
-+++ eccodes-2.1.0/tools/grib_compare.c
+--- eccodes-2.3.0.orig/tools/grib_compare.c
++++ eccodes-2.3.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,11 +84,11 @@ Index: eccodes-2.1.0/tools/grib_compare.c
exit(1);
}
}
-Index: eccodes-2.1.0/tools/grib_options.c
+Index: eccodes-2.3.0/tools/grib_options.c
===================================================================
---- eccodes-2.1.0.orig/tools/grib_options.c
-+++ eccodes-2.1.0/tools/grib_options.c
-@@ -111,7 +111,7 @@ grib_options_help grib_options_help_list
+--- eccodes-2.3.0.orig/tools/grib_options.c
++++ eccodes-2.3.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);
@@ -97,7 +97,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
{
int i=0;
printf("\nNAME \t%s\n\n",grib_tool_name);
-@@ -171,7 +171,7 @@ int grib_get_runtime_options(int argc,ch
+@@ -172,7 +172,7 @@ int grib_get_runtime_options(int argc,ch
while ((c = getopt (argc, argv, optstr)) != -1) {
@@ -106,7 +106,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
i=0;
while ( i < grib_options_count && grib_options[i].id[0] != c) i++;
grib_options[i].on=1;
-@@ -244,7 +244,7 @@ int grib_process_runtime_options(grib_co
+@@ -245,7 +245,7 @@ int grib_process_runtime_options(grib_co
if (grib_options_on("G")) grib_gribex_mode_on(context);
nfiles=argc-optind;
@@ -115,7 +115,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
if (has_input_extra) {
options->infile_extra=(grib_tools_file*)calloc(1,sizeof(grib_tools_file));
-@@ -302,7 +302,7 @@ int grib_process_runtime_options(grib_co
+@@ -303,7 +303,7 @@ int grib_process_runtime_options(grib_co
options->requested_print_keys_count=MAX_KEYS;
ret = parse_keyval_string(grib_tool_name,karg,0,GRIB_TYPE_UNDEFINED,
options->requested_print_keys,&(options->requested_print_keys_count));
@@ -124,7 +124,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
GRIB_CHECK_NOLINE(ret,0);
options->strict=grib_options_on("S");
-@@ -323,14 +323,14 @@ int grib_process_runtime_options(grib_co
+@@ -324,14 +324,14 @@ int grib_process_runtime_options(grib_co
sarg=grib_options_get_option("s:");
options->set_values_count=MAX_KEYS;
ret=parse_keyval_string(grib_tool_name, sarg,1,GRIB_TYPE_UNDEFINED,options->set_values,&(options->set_values_count));
@@ -141,7 +141,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
}
if (grib_options_on("c:")) {
-@@ -338,7 +338,7 @@ int grib_process_runtime_options(grib_co
+@@ -339,7 +339,7 @@ int grib_process_runtime_options(grib_co
options->compare_count=MAX_KEYS;
ret=parse_keyval_string(grib_tool_name,sarg,0,GRIB_TYPE_UNDEFINED,options->compare,
&(options->compare_count));
@@ -150,7 +150,7 @@ Index: eccodes-2.1.0/tools/grib_options.c
}
if (grib_options_on("e")) {
for (i=0;i<names_count; i++) {
-@@ -353,7 +353,7 @@ int grib_process_runtime_options(grib_co
+@@ -354,7 +354,7 @@ int grib_process_runtime_options(grib_co
options->constraints_count=MAX_KEYS;
ret=parse_keyval_string(grib_tool_name,warg,1,GRIB_TYPE_UNDEFINED,
options->constraints,&(options->constraints_count));
@@ -159,11 +159,11 @@ Index: eccodes-2.1.0/tools/grib_options.c
return GRIB_SUCCESS;
}
-Index: eccodes-2.1.0/tools/grib_to_netcdf.c
+Index: eccodes-2.3.0/tools/grib_to_netcdf.c
===================================================================
---- eccodes-2.1.0.orig/tools/grib_to_netcdf.c
-+++ eccodes-2.1.0/tools/grib_to_netcdf.c
-@@ -3969,7 +3969,7 @@ int grib_tool_init(grib_runtime_options*
+--- eccodes-2.3.0.orig/tools/grib_to_netcdf.c
++++ eccodes-2.3.0/tools/grib_to_netcdf.c
+@@ -3973,7 +3973,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.1.0/tools/grib_to_netcdf.c
exit(1);
}
}
-@@ -3979,7 +3979,7 @@ int grib_tool_init(grib_runtime_options*
+@@ -3983,7 +3983,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.1.0/tools/grib_to_netcdf.c
exit(1);
}
set_value(user_r, "referencedate", theArg);
-@@ -4158,7 +4158,7 @@ int grib_tool_finalise_action(grib_runti
+@@ -4162,7 +4162,7 @@ int grib_tool_finalise_action(grib_runti
if(options->outfile==NULL || options->outfile->name==NULL)
{
@@ -190,10 +190,10 @@ Index: eccodes-2.1.0/tools/grib_to_netcdf.c
exit(1);
}
-Index: eccodes-2.1.0/tools/bufr_compare.c
+Index: eccodes-2.3.0/tools/bufr_compare.c
===================================================================
---- eccodes-2.1.0.orig/tools/bufr_compare.c
-+++ eccodes-2.1.0/tools/bufr_compare.c
+--- eccodes-2.3.0.orig/tools/bufr_compare.c
++++ eccodes-2.3.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