[eccodes] 77/106: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 09:05:26 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 173478cdcca6f8b95f3821bf20f7fbf3bed46774
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Feb 15 16:36:56 2017 +0000
refresh patches
---
debian/changelog | 1 +
debian/patches/disable-download-tests.patch | 37 +++++----------
debian/patches/hurd.patch | 47 -------------------
debian/patches/numpy-fixes.patch | 6 +--
debian/patches/py3-fixes.patch | 12 ++---
debian/patches/python3.patch | 70 ++++++++++++-----------------
debian/patches/remove-rpms.patch | 6 +--
debian/patches/reproducible.patch | 26 +++++------
debian/patches/series | 1 -
debian/patches/static-fix.patch | 56 +++++++++++------------
10 files changed, 95 insertions(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd55ce1..1a4a028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
eccodes (2.1.0-1) UNRELEASED; urgency=medium
* New upstream release
+ - hurd patch now merged upstream
-- Alastair McKinstry <mckinstry at debian.org> Wed, 15 Feb 2017 16:22:47 +0000
diff --git a/debian/patches/disable-download-tests.patch b/debian/patches/disable-download-tests.patch
index 6e6b1c2..304d07f 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.0.0/tests/CMakeLists.txt
+Index: eccodes-2.1.0/tests/CMakeLists.txt
===================================================================
---- eccodes-2.0.0.orig/tests/CMakeLists.txt
-+++ eccodes-2.0.0/tests/CMakeLists.txt
-@@ -141,8 +141,8 @@ foreach( test ${tests2} )
+--- eccodes-2.1.0.orig/tests/CMakeLists.txt
++++ eccodes-2.1.0/tests/CMakeLists.txt
+@@ -152,8 +152,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.0.0/tests/CMakeLists.txt
)
endforeach()
-@@ -161,7 +161,7 @@ if( HAVE_PYTHON AND ENABLE_EXTRA_TESTS )
+@@ -172,7 +172,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.0.0/tests/CMakeLists.txt
)
endforeach()
endif()
-@@ -172,7 +172,7 @@ ecbuild_add_test( TARGET eccodes_t_lamb_
+@@ -183,7 +183,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.0.0/tests/CMakeLists.txt
)
# These ones are conditional
-@@ -181,28 +181,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
+@@ -192,28 +192,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
TYPE SCRIPT
CONDITION HAVE_NETCDF
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
@@ -69,11 +69,11 @@ Index: eccodes-2.0.0/tests/CMakeLists.txt
)
ecbuild_add_test( TARGET eccodes_t_grib_check_param_concepts
-Index: eccodes-2.0.0/cmake/ecbuild_get_test_data.cmake
+Index: eccodes-2.1.0/cmake/ecbuild_get_test_data.cmake
===================================================================
---- eccodes-2.0.0.orig/cmake/ecbuild_get_test_data.cmake
-+++ eccodes-2.0.0/cmake/ecbuild_get_test_data.cmake
-@@ -159,7 +159,7 @@ function( ecbuild_get_test_data )
+--- eccodes-2.1.0.orig/cmake/ecbuild_get_test_data.cmake
++++ eccodes-2.1.0/cmake/ecbuild_get_test_data.cmake
+@@ -178,7 +178,7 @@ function( ecbuild_get_test_data )
# download the data
@@ -82,7 +82,7 @@ Index: eccodes-2.0.0/cmake/ecbuild_get_test_data.cmake
# perform the checksum if requested
-@@ -220,13 +220,13 @@ function( ecbuild_get_test_data )
+@@ -239,13 +239,13 @@ function( ecbuild_get_test_data )
endif()
@@ -102,16 +102,3 @@ Index: eccodes-2.0.0/cmake/ecbuild_get_test_data.cmake
endfunction(ecbuild_get_test_data)
-Index: eccodes-2.0.0/data/tigge/CMakeLists.txt
-===================================================================
---- eccodes-2.0.0.orig/data/tigge/CMakeLists.txt
-+++ eccodes-2.0.0/data/tigge/CMakeLists.txt
-@@ -9,7 +9,7 @@ ecbuild_get_test_multidata( TARGET eccod
- NOCHECK
- NAMES ${tigge_files_to_download} )
- if( ENABLE_TESTS )
-- set_property( TEST eccodes_download_tigge_gribs APPEND PROPERTY LABELS download_data )
-+# set_property( TEST eccodes_download_tigge_gribs APPEND PROPERTY LABELS download_data )
- endif()
-
- #######
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index 96edb76..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix for GNU/Hurd
-Last-Updated: 2016-04-27
-Forwarded: https://software.ecmwf.int/issues/browse/SUP-1588
-
-Index: eccodes-2.0.0/src/grib_api_internal.h
-===================================================================
---- eccodes-2.0.0.orig/src/grib_api_internal.h
-+++ eccodes-2.0.0/src/grib_api_internal.h
-@@ -21,6 +21,7 @@
- extern "C" {
- #endif
-
-+
- /* cmake config header */
- #ifdef HAVE_ECCODES_CONFIG_H
- #include "eccodes_config.h"
-@@ -172,11 +173,15 @@ extern "C" {
- #endif
-
- /* Compile time assertion - Thanks to Ralf Holly */
-+#ifdef __GNU__
-+#define COMPILE_TIME_ASSERT(condition) \
-+ extern int compile_time_assert[!!(condition) - 1]
-+#else
- #define COMPILE_TIME_ASSERT(e) \
- do { \
- enum { assert_static__ = 1/(e) }; \
- } while (0)
--
-+#endif
-
- #ifndef NDEBUG
- #define DebugAssertAccess(array, index, size) \
-Index: eccodes-2.0.0/tools/grib_tools.h
-===================================================================
---- eccodes-2.0.0.orig/tools/grib_tools.h
-+++ eccodes-2.0.0/tools/grib_tools.h
-@@ -8,6 +8,8 @@
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-+#define _FILE_OFFSET_BITS 64 /* 64-bit offsets off_t not the default on Hurd/i386 */
-+
- #include "grib_api_internal.h"
- #include <stdio.h>
- #ifndef ECCODES_ON_WINDOWS
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index 74d17d1..2757e31 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.0.0/python/numpy.i
+Index: eccodes-2.1.0/python/numpy.i
===================================================================
---- eccodes-2.0.0.orig/python/numpy.i
-+++ eccodes-2.0.0/python/numpy.i
+--- eccodes-2.1.0.orig/python/numpy.i
++++ eccodes-2.1.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 e33b834..aa7174d 100644
--- a/debian/patches/py3-fixes.patch
+++ b/debian/patches/py3-fixes.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.0.0/python/CMakeLists.txt
+Index: eccodes-2.1.0/python/CMakeLists.txt
===================================================================
---- eccodes-2.0.0.orig/python/CMakeLists.txt
-+++ eccodes-2.0.0/python/CMakeLists.txt
+--- eccodes-2.1.0.orig/python/CMakeLists.txt
++++ eccodes-2.1.0/python/CMakeLists.txt
@@ -1,9 +1,9 @@
if( HAVE_PYTHON )
@@ -16,10 +16,10 @@ Index: eccodes-2.0.0/python/CMakeLists.txt
# preparing for generating setup.py
if( HAVE_LIBJASPER )
-Index: eccodes-2.0.0/python/gribapi_swig.i
+Index: eccodes-2.1.0/python/gribapi_swig.i
===================================================================
---- eccodes-2.0.0.orig/python/gribapi_swig.i
-+++ eccodes-2.0.0/python/gribapi_swig.i
+--- eccodes-2.1.0.orig/python/gribapi_swig.i
++++ eccodes-2.1.0/python/gribapi_swig.i
@@ -17,14 +17,17 @@
import_array();
%}
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 53409cb..38907ef 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.0.2/python/test_iterator.py
+Index: eccodes-2.1.0/python/test_iterator.py
===================================================================
---- eccodes-2.0.2.orig/python/test_iterator.py
-+++ eccodes-2.0.2/python/test_iterator.py
+--- eccodes-2.1.0.orig/python/test_iterator.py
++++ eccodes-2.1.0/python/test_iterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -33,10 +33,10 @@ Index: eccodes-2.0.2/python/test_iterator.py
grib_iterator_delete(iterid)
grib_release(gid)
-Index: eccodes-2.0.2/python/test_index.py
+Index: eccodes-2.1.0/python/test_index.py
===================================================================
---- eccodes-2.0.2.orig/python/test_index.py
-+++ eccodes-2.0.2/python/test_index.py
+--- eccodes-2.1.0.orig/python/test_index.py
++++ eccodes-2.1.0/python/test_index.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -113,10 +113,10 @@ Index: eccodes-2.0.2/python/test_index.py
main()
- #print "------------------------------------"
+ #print ("------------------------------------")
-Index: eccodes-2.0.2/python/test_keysiterator.py
+Index: eccodes-2.1.0/python/test_keysiterator.py
===================================================================
---- eccodes-2.0.2.orig/python/test_keysiterator.py
-+++ eccodes-2.0.2/python/test_keysiterator.py
+--- eccodes-2.1.0.orig/python/test_keysiterator.py
++++ eccodes-2.1.0/python/test_keysiterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -140,10 +140,10 @@ Index: eccodes-2.0.2/python/test_keysiterator.py
fid.close()
-
-
-Index: eccodes-2.0.2/python/test_general.py
+Index: eccodes-2.1.0/python/test_general.py
===================================================================
---- eccodes-2.0.2.orig/python/test_general.py
-+++ eccodes-2.0.2/python/test_general.py
+--- eccodes-2.1.0.orig/python/test_general.py
++++ eccodes-2.1.0/python/test_general.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -305,10 +305,10 @@ Index: eccodes-2.0.2/python/test_general.py
main()
- print "------------------------------------"
+ print ("------------------------------------")
-Index: eccodes-2.0.2/python/test_extra.py
+Index: eccodes-2.1.0/python/test_extra.py
===================================================================
---- eccodes-2.0.2.orig/python/test_extra.py
-+++ eccodes-2.0.2/python/test_extra.py
+--- eccodes-2.1.0.orig/python/test_extra.py
++++ eccodes-2.1.0/python/test_extra.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
@@ -360,10 +360,10 @@ Index: eccodes-2.0.2/python/test_extra.py
grib_write(gid,oid)
-Index: eccodes-2.0.2/examples/python/keys_iterator_gts.py
+Index: eccodes-2.1.0/examples/python/keys_iterator_gts.py
===================================================================
---- eccodes-2.0.2.orig/examples/python/keys_iterator_gts.py
-+++ eccodes-2.0.2/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
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -391,10 +391,10 @@ Index: eccodes-2.0.2/examples/python/keys_iterator_gts.py
return 1
-Index: eccodes-2.0.2/examples/python/keys_iterator_bufr.py
+Index: eccodes-2.1.0/examples/python/binary_message.py
===================================================================
---- eccodes-2.0.2.orig/examples/python/keys_iterator_bufr.py
-+++ eccodes-2.0.2/examples/python/keys_iterator_bufr.py
+--- eccodes-2.1.0.orig/examples/python/binary_message.py
++++ eccodes-2.1.0/examples/python/binary_message.py
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -403,34 +403,22 @@ Index: eccodes-2.0.2/examples/python/keys_iterator_bufr.py
import traceback
import sys
-Index: eccodes-2.0.2/examples/python/binary_message.py
+Index: eccodes-2.1.0/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.0.2.orig/examples/python/binary_message.py
-+++ eccodes-2.0.2/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.0.2/python/gribapi/gribapi.py
-===================================================================
---- eccodes-2.0.2.orig/python/gribapi/gribapi.py
-+++ eccodes-2.0.2/python/gribapi/gribapi.py
-@@ -22,14 +22,21 @@ When this is enabed, then the system Pyt
- - NumPy
+--- eccodes-2.1.0.orig/python/gribapi/gribapi.py
++++ eccodes-2.1.0/python/gribapi/gribapi.py
+@@ -23,7 +23,7 @@ When this is enabed, then the system Pyt
"""
--import gribapi_swig as _internal
+ import gribapi_swig as _internal
-# from gribapi import gribapi_swig as _internal
+from gribapi import gribapi_swig as _internal
import types
import sys
import os
- from functools import wraps
- # import inspect
+@@ -32,6 +32,14 @@ from functools import wraps
+ from . import errors
+ from errors import * # noqa
+try:
+ type(file)
diff --git a/debian/patches/remove-rpms.patch b/debian/patches/remove-rpms.patch
index ecee3d4..6d1fda5 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.0.0/configure.ac
+Index: eccodes-2.1.0/configure.ac
===================================================================
---- eccodes-2.0.0.orig/configure.ac
-+++ eccodes-2.0.0/configure.ac
+--- eccodes-2.1.0.orig/configure.ac
++++ eccodes-2.1.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/reproducible.patch b/debian/patches/reproducible.patch
index 1337ed1..96f7e87 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -3,11 +3,11 @@ Description: Make builds bit-reproducible
Last-Updated: 2016-10-27
Forwarded: https://software.ecmwf.int/issues/browse/SUP-1590
-Index: eccodes-2.0.0/CMakeLists.txt
+Index: eccodes-2.1.0/CMakeLists.txt
===================================================================
---- eccodes-2.0.0.orig/CMakeLists.txt
-+++ eccodes-2.0.0/CMakeLists.txt
-@@ -81,6 +81,12 @@ ecbuild_add_option( FEATURE FORTRAN
+--- eccodes-2.1.0.orig/CMakeLists.txt
++++ eccodes-2.1.0/CMakeLists.txt
+@@ -82,6 +82,12 @@ ecbuild_add_option( FEATURE FORTRAN
# REQUIRED_LANGUAGES Fortran # TODO
)
@@ -20,10 +20,10 @@ Index: eccodes-2.0.0/CMakeLists.txt
# TODO Remove this after REQUIRED_LANGUAGES
if( ENABLE_FORTRAN )
# will set EC_HAVE_FORTRAN with the result
-Index: eccodes-2.0.0/cmake/ecbuild_config.h.in
+Index: eccodes-2.1.0/cmake/ecbuild_config.h.in
===================================================================
---- eccodes-2.0.0.orig/cmake/ecbuild_config.h.in
-+++ eccodes-2.0.0/cmake/ecbuild_config.h.in
+--- eccodes-2.1.0.orig/cmake/ecbuild_config.h.in
++++ eccodes-2.1.0/cmake/ecbuild_config.h.in
@@ -150,14 +150,18 @@
/* config info */
@@ -56,10 +56,10 @@ Index: eccodes-2.0.0/cmake/ecbuild_config.h.in
#cmakedefine EC_HAVE_FORTRAN
#ifdef EC_HAVE_FORTRAN
-Index: eccodes-2.0.0/cmake/ecbuild_print_summary.cmake
+Index: eccodes-2.1.0/cmake/ecbuild_print_summary.cmake
===================================================================
---- eccodes-2.0.0.orig/cmake/ecbuild_print_summary.cmake
-+++ eccodes-2.0.0/cmake/ecbuild_print_summary.cmake
+--- eccodes-2.1.0.orig/cmake/ecbuild_print_summary.cmake
++++ eccodes-2.1.0/cmake/ecbuild_print_summary.cmake
@@ -57,7 +57,9 @@ macro( ecbuild_print_summary )
ecbuild_info( "endiness : Little Endian -- IEEE [${IEEE_LE}]" )
endif()
@@ -71,10 +71,10 @@ Index: eccodes-2.0.0/cmake/ecbuild_print_summary.cmake
ecbuild_info( "install prefix : [${CMAKE_INSTALL_PREFIX}]" )
ecbuild_info( " bin dir : [${${PNAME}_FULL_INSTALL_BIN_DIR}]" )
ecbuild_info( " lib dir : [${${PNAME}_FULL_INSTALL_LIB_DIR}]" )
-Index: eccodes-2.0.0/cmake/ecbuild_get_date.cmake
+Index: eccodes-2.1.0/cmake/ecbuild_get_date.cmake
===================================================================
---- eccodes-2.0.0.orig/cmake/ecbuild_get_date.cmake
-+++ eccodes-2.0.0/cmake/ecbuild_get_date.cmake
+--- eccodes-2.1.0.orig/cmake/ecbuild_get_date.cmake
++++ eccodes-2.1.0/cmake/ecbuild_get_date.cmake
@@ -20,12 +20,16 @@
##############################################################################
diff --git a/debian/patches/series b/debian/patches/series
index 5abf148..c44e1ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
grib_bits.diff
static-libs.patch
reproducible.patch
-hurd.patch
disable-download-tests.patch
static-fix.patch
python3.patch
diff --git a/debian/patches/static-fix.patch b/debian/patches/static-fix.patch
index a91e260..9d5d468 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.0.0/tools/mars_request.c
+Index: eccodes-2.1.0/tools/mars_request.c
===================================================================
---- eccodes-2.0.0.orig/tools/mars_request.c
-+++ eccodes-2.0.0/tools/mars_request.c
+--- eccodes-2.1.0.orig/tools/mars_request.c
++++ eccodes-2.1.0/tools/mars_request.c
@@ -13,7 +13,7 @@
#include "grib_api.h"
@@ -19,10 +19,10 @@ Index: eccodes-2.0.0/tools/mars_request.c
{
fprintf(stderr,"%s: file\n",prog);
exit(1);
-Index: eccodes-2.0.0/tools/gaussian.c
+Index: eccodes-2.1.0/tools/gaussian.c
===================================================================
---- eccodes-2.0.0.orig/tools/gaussian.c
-+++ eccodes-2.0.0/tools/gaussian.c
+--- eccodes-2.1.0.orig/tools/gaussian.c
++++ eccodes-2.1.0/tools/gaussian.c
@@ -14,7 +14,7 @@
#include "grib_api.h"
@@ -32,10 +32,10 @@ Index: eccodes-2.0.0/tools/gaussian.c
{
fprintf(stderr,"%s: N\n",prog);
exit(1);
-Index: eccodes-2.0.0/tools/grib_check_gaussian_grid.c
+Index: eccodes-2.1.0/tools/grib_check_gaussian_grid.c
===================================================================
---- eccodes-2.0.0.orig/tools/grib_check_gaussian_grid.c
-+++ eccodes-2.0.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
@@ -30,7 +30,7 @@ int DBL_EQUAL(double d1, double d2, doub
return fabs(d1-d2) <= tolerance;
}
@@ -45,10 +45,10 @@ Index: eccodes-2.0.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.0.0/tools/grib_nearest_land.c
+Index: eccodes-2.1.0/tools/grib_nearest_land.c
===================================================================
---- eccodes-2.0.0.orig/tools/grib_nearest_land.c
-+++ eccodes-2.0.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
@@ -19,7 +19,7 @@
#include "grib_api_internal.h"
@@ -58,11 +58,11 @@ Index: eccodes-2.0.0/tools/grib_nearest_land.c
printf("Usage: %s latlon_file grib_orography grib_file grib_file ...\n",prog);
exit(1);
}
-Index: eccodes-2.0.0/tools/grib_tools.h
+Index: eccodes-2.1.0/tools/grib_tools.h
===================================================================
---- eccodes-2.0.0.orig/tools/grib_tools.h
-+++ eccodes-2.0.0/tools/grib_tools.h
-@@ -179,7 +179,7 @@ int grib_tool(int argc, char **argv);
+--- 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);
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.0.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.0.0/tools/grib_compare.c
+Index: eccodes-2.1.0/tools/grib_compare.c
===================================================================
---- eccodes-2.0.0.orig/tools/grib_compare.c
-+++ eccodes-2.0.0/tools/grib_compare.c
+--- eccodes-2.1.0.orig/tools/grib_compare.c
++++ eccodes-2.1.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.0.0/tools/grib_compare.c
exit(1);
}
}
-Index: eccodes-2.0.0/tools/grib_options.c
+Index: eccodes-2.1.0/tools/grib_options.c
===================================================================
---- eccodes-2.0.0.orig/tools/grib_options.c
-+++ eccodes-2.0.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
int grib_options_help_count=sizeof(grib_options_help_list)/sizeof(grib_options_help);
@@ -159,10 +159,10 @@ Index: eccodes-2.0.0/tools/grib_options.c
return GRIB_SUCCESS;
}
-Index: eccodes-2.0.0/tools/grib_to_netcdf.c
+Index: eccodes-2.1.0/tools/grib_to_netcdf.c
===================================================================
---- eccodes-2.0.0.orig/tools/grib_to_netcdf.c
-+++ eccodes-2.0.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*
}
if (kvalue->name == NULL) {
@@ -190,10 +190,10 @@ Index: eccodes-2.0.0/tools/grib_to_netcdf.c
exit(1);
}
-Index: eccodes-2.0.0/tools/bufr_compare.c
+Index: eccodes-2.1.0/tools/bufr_compare.c
===================================================================
---- eccodes-2.0.0.orig/tools/bufr_compare.c
-+++ eccodes-2.0.0/tools/bufr_compare.c
+--- eccodes-2.1.0.orig/tools/bufr_compare.c
++++ eccodes-2.1.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