[eccodes] 03/05: - patches refreshed. - patch for cmake fix obsolete; fixed upstream
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:24:37 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 949ae4c673dec6eb90f0677919c7d91622457ae9
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Aug 13 15:17:32 2017 +0100
- patches refreshed.
- patch for cmake fix obsolete; fixed upstream
---
debian/changelog | 2 ++
debian/patches/disable-download-tests.patch | 22 ++++++------
debian/patches/findnetcdf4-fix.patch | 27 ---------------
debian/patches/grib_bits.diff | 52 +++++++++++++--------------
debian/patches/memfs.patch | 6 ++--
debian/patches/numpy-fixes.patch | 6 ++--
debian/patches/py3-fixes.patch | 30 ++++++++--------
debian/patches/python3.patch | 48 ++++++++++++-------------
debian/patches/remove-rpms.patch | 6 ++--
debian/patches/reproducible.patch | 30 ++++++++--------
debian/patches/series | 1 -
debian/patches/static-fix.patch | 54 ++++++++++++++---------------
debian/patches/static-libs.patch | 36 ++++++++-----------
13 files changed, 144 insertions(+), 176 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 16cb2be..b3d0cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
eccodes (2.4.1-1) UNRELEASED; urgency=medium
* New upstream release
+ - patches reqfreshed.
+ - patch for cmake fix obsolete; fixed upstream
-- Alastair McKinstry <mckinstry at debian.org> Sun, 13 Aug 2017 12:00:20 +0100
diff --git a/debian/patches/disable-download-tests.patch b/debian/patches/disable-download-tests.patch
index 18bb280..90d524f 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.3.0/tests/CMakeLists.txt
+Index: eccodes-2.4.1/tests/CMakeLists.txt
===================================================================
---- eccodes-2.3.0.orig/tests/CMakeLists.txt
-+++ eccodes-2.3.0/tests/CMakeLists.txt
-@@ -154,8 +154,8 @@ foreach( test ${tests_data_reqd} )
+--- eccodes-2.4.1.orig/tests/CMakeLists.txt
++++ eccodes-2.4.1/tests/CMakeLists.txt
+@@ -159,8 +159,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.3.0/tests/CMakeLists.txt
)
endforeach()
-@@ -174,7 +174,7 @@ if( HAVE_PYTHON AND ENABLE_EXTRA_TESTS )
+@@ -179,7 +179,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.3.0/tests/CMakeLists.txt
)
endforeach()
endif()
-@@ -185,7 +185,7 @@ ecbuild_add_test( TARGET eccodes_t_lamb_
+@@ -190,7 +190,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.3.0/tests/CMakeLists.txt
)
# These ones are conditional
-@@ -194,28 +194,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
+@@ -199,28 +199,28 @@ ecbuild_add_test( TARGET eccodes_t_grib_
TYPE SCRIPT
CONDITION HAVE_NETCDF
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
@@ -69,17 +69,17 @@ Index: eccodes-2.3.0/tests/CMakeLists.txt
)
ecbuild_add_test( TARGET eccodes_t_grib_check_param_concepts
-@@ -228,5 +228,5 @@ ecbuild_add_test( TARGET eccodes_t_ecc-3
+@@ -233,5 +233,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
+Index: eccodes-2.4.1/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
+--- eccodes-2.4.1.orig/cmake/ecbuild_get_test_data.cmake
++++ eccodes-2.4.1/cmake/ecbuild_get_test_data.cmake
@@ -178,7 +178,7 @@ function( ecbuild_get_test_data )
# download the data
diff --git a/debian/patches/findnetcdf4-fix.patch b/debian/patches/findnetcdf4-fix.patch
deleted file mode 100644
index 8850d27..0000000
--- a/debian/patches/findnetcdf4-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Remove incorrect else() statements
- For cmake >= 3.9.0, these incorrect statements cause a build failure
- rather than gracefully building without netcdf component.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870040
-Last-Update: 2017-07-30
-Forwarded: no
-
---- eccodes-2.4.0.orig/cmake/contrib/FindNetCDF4.cmake
-+++ eccodes-2.4.0/cmake/contrib/FindNetCDF4.cmake
-@@ -195,15 +195,13 @@ else()
- list( APPEND NETCDF_INCLUDE_DIRS ${NETCDF_${INC}_INCLUDE_DIR} )
- else()
- list( FIND NETCDF_REQUIRED ${INC} location )
-- if( ${location} EQUAL -1 )
-- else()
-+ if( NOT (${location} EQUAL -1 ) )
- if(NETCDF_FIND_REQUIRED)
- ecbuild_error( "\"${INC}\" is not found for NetCDF component ${LANGUAGE}" )
- elseif( NOT NETCDF_FIND_QUIETLY )
- message( STATUS "\"${INC}\" is not found for NetCDF component ${LANGUAGE}" )
- endif()
- set( NETCDF_${LANGUAGE}_FOUND 0 )
-- else()
- endif()
- endif()
- endforeach()
diff --git a/debian/patches/grib_bits.diff b/debian/patches/grib_bits.diff
index 3988020..0d31e1b 100644
--- a/debian/patches/grib_bits.diff
+++ b/debian/patches/grib_bits.diff
@@ -33,10 +33,10 @@ Proposed patch fixes these corner-cases by setting the result of shift
operation to 0 if right operand is greater than or equal to size of long
(actually, no shifting is performed, the result is set to zero).
-Index: eccodes-2.0.0/src/grib_bits.c
+Index: eccodes-2.4.1/src/grib_bits.c
===================================================================
---- eccodes-2.0.0.orig/src/grib_bits.c
-+++ eccodes-2.0.0/src/grib_bits.c
+--- eccodes-2.4.1.orig/src/grib_bits.c
++++ eccodes-2.4.1/src/grib_bits.c
@@ -24,12 +24,11 @@
long GRIB_MASK = -1; /* Mask of sword bits */
@@ -51,27 +51,27 @@ Index: eccodes-2.0.0/src/grib_bits.c
static unsigned long dmasks[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x00, };
static int max_nbits = sizeof(unsigned long)*8;
-Index: eccodes-2.0.0/src/grib_bits_fast_big_endian.c
+Index: eccodes-2.4.1/src/grib_bits_fast_big_endian.c
===================================================================
---- eccodes-2.0.0.orig/src/grib_bits_fast_big_endian.c
-+++ eccodes-2.0.0/src/grib_bits_fast_big_endian.c
-@@ -123,9 +123,16 @@ int grib_encode_unsigned_long(unsigned c
- countOfLeftmostBits = max_nbits - startBit;
- startBit = max_nbits - remainingBits;
- remainingBits -= countOfLeftmostBits;
-- destination[nextWord] =
-- ((destination[nextWord] >> countOfLeftmostBits) << countOfLeftmostBits)
-- + (VALUE(val,startBit,countOfLeftmostBits));
-+ if (countOfLeftmostBits < max_nbits)
-+ {
-+ destination[nextWord] =
-+ ((destination[nextWord] >> countOfLeftmostBits) << countOfLeftmostBits)
-+ + (VALUE(val,startBit,countOfLeftmostBits));
-+ }
-+ else
-+ {
-+ destination[nextWord] = (VALUE(val,startBit,countOfLeftmostBits));
-+ }
- startBit = 0;
- nextWord++;
- }
+--- eccodes-2.4.1.orig/src/grib_bits_fast_big_endian.c
++++ eccodes-2.4.1/src/grib_bits_fast_big_endian.c
+@@ -154,9 +154,16 @@ int grib_encode_unsigned_long(unsigned c
+ countOfLeftmostBits = max_nbits - startBit;
+ startBit = max_nbits - remainingBits;
+ remainingBits -= countOfLeftmostBits;
+- destination[nextWord] =
+- ((destination[nextWord] >> countOfLeftmostBits) << countOfLeftmostBits)
+- + (VALUE(val,startBit,countOfLeftmostBits));
++ if (countOfLeftmostBits < max_nbits)
++ {
++ destination[nextWord] =
++ ((destination[nextWord] >> countOfLeftmostBits) << countOfLeftmostBits)
++ + (VALUE(val,startBit,countOfLeftmostBits));
++ }
++ else
++ {
++ destination[nextWord] = (VALUE(val,startBit,countOfLeftmostBits));
++ }
+ startBit = 0;
+ nextWord++;
+ }
diff --git a/debian/patches/memfs.patch b/debian/patches/memfs.patch
index 74adfd0..2691674 100644
--- a/debian/patches/memfs.patch
+++ b/debian/patches/memfs.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.4.0/memfs/CMakeLists.txt
+Index: eccodes-2.4.1/memfs/CMakeLists.txt
===================================================================
---- eccodes-2.4.0.orig/memfs/CMakeLists.txt
-+++ eccodes-2.4.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
)
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index fcd25ec..2618bb3 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.3.0/python/numpy.i
+Index: eccodes-2.4.1/python/numpy.i
===================================================================
---- eccodes-2.3.0.orig/python/numpy.i
-+++ eccodes-2.3.0/python/numpy.i
+--- eccodes-2.4.1.orig/python/numpy.i
++++ eccodes-2.4.1/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 59f1b44..bed1ada 100644
--- a/debian/patches/py3-fixes.patch
+++ b/debian/patches/py3-fixes.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.4.0/python/CMakeLists.txt
+Index: eccodes-2.4.1/python/CMakeLists.txt
===================================================================
---- eccodes-2.4.0.orig/python/CMakeLists.txt
-+++ eccodes-2.4.0/python/CMakeLists.txt
+--- eccodes-2.4.1.orig/python/CMakeLists.txt
++++ eccodes-2.4.1/python/CMakeLists.txt
@@ -1,9 +1,9 @@
if( HAVE_PYTHON )
@@ -16,10 +16,10 @@ Index: eccodes-2.4.0/python/CMakeLists.txt
# preparing for generating setup.py
if( HAVE_LIBJASPER )
-Index: eccodes-2.4.0/python/gribapi_swig.i
+Index: eccodes-2.4.1/python/gribapi_swig.i
===================================================================
---- eccodes-2.4.0.orig/python/gribapi_swig.i
-+++ eccodes-2.4.0/python/gribapi_swig.i
+--- eccodes-2.4.1.orig/python/gribapi_swig.i
++++ eccodes-2.4.1/python/gribapi_swig.i
@@ -17,14 +17,17 @@
import_array();
%}
@@ -64,10 +64,10 @@ Index: eccodes-2.4.0/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.0/python/eccodes/high_level/codesfile.py
+Index: eccodes-2.4.1/python/eccodes/high_level/codesfile.py
===================================================================
---- eccodes-2.4.0.orig/python/eccodes/high_level/codesfile.py
-+++ eccodes-2.4.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
@@ -6,9 +6,9 @@ Author: Daniel Lee, DWD, 2016
"""
@@ -80,10 +80,10 @@ Index: eccodes-2.4.0/python/eccodes/high_level/codesfile.py
"""
An abstract class to specify and/or implement common behaviour that files
-Index: eccodes-2.4.0/python/gribapi/gribapi.py
+Index: eccodes-2.4.1/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.4.0.orig/python/gribapi/gribapi.py
-+++ eccodes-2.4.0/python/gribapi/gribapi.py
+--- eccodes-2.4.1.orig/python/gribapi/gribapi.py
++++ eccodes-2.4.1/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.0/python/gribapi/gribapi.py
try:
type(file)
-Index: eccodes-2.4.0/python/gribapi/errors.py
+Index: eccodes-2.4.1/python/gribapi/errors.py
===================================================================
---- eccodes-2.4.0.orig/python/gribapi/errors.py
-+++ eccodes-2.4.0/python/gribapi/errors.py
+--- eccodes-2.4.1.orig/python/gribapi/errors.py
++++ eccodes-2.4.1/python/gribapi/errors.py
@@ -2,7 +2,7 @@
Exception class hierarchy
"""
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index dc03c23..fea76cf 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.3.0/python/test_iterator.py
+Index: eccodes-2.4.1/python/test_iterator.py
===================================================================
---- eccodes-2.3.0.orig/python/test_iterator.py
-+++ eccodes-2.3.0/python/test_iterator.py
+--- eccodes-2.4.1.orig/python/test_iterator.py
++++ eccodes-2.4.1/python/test_iterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -33,10 +33,10 @@ Index: eccodes-2.3.0/python/test_iterator.py
grib_iterator_delete(iterid)
grib_release(gid)
-Index: eccodes-2.3.0/python/test_index.py
+Index: eccodes-2.4.1/python/test_index.py
===================================================================
---- eccodes-2.3.0.orig/python/test_index.py
-+++ eccodes-2.3.0/python/test_index.py
+--- eccodes-2.4.1.orig/python/test_index.py
++++ eccodes-2.4.1/python/test_index.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -113,10 +113,10 @@ Index: eccodes-2.3.0/python/test_index.py
main()
- #print "------------------------------------"
+ #print ("------------------------------------")
-Index: eccodes-2.3.0/python/test_keysiterator.py
+Index: eccodes-2.4.1/python/test_keysiterator.py
===================================================================
---- eccodes-2.3.0.orig/python/test_keysiterator.py
-+++ eccodes-2.3.0/python/test_keysiterator.py
+--- eccodes-2.4.1.orig/python/test_keysiterator.py
++++ eccodes-2.4.1/python/test_keysiterator.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -140,10 +140,10 @@ Index: eccodes-2.3.0/python/test_keysiterator.py
fid.close()
-
-
-Index: eccodes-2.3.0/python/test_general.py
+Index: eccodes-2.4.1/python/test_general.py
===================================================================
---- eccodes-2.3.0.orig/python/test_general.py
-+++ eccodes-2.3.0/python/test_general.py
+--- eccodes-2.4.1.orig/python/test_general.py
++++ eccodes-2.4.1/python/test_general.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -305,10 +305,10 @@ Index: eccodes-2.3.0/python/test_general.py
main()
- print "------------------------------------"
+ print ("------------------------------------")
-Index: eccodes-2.3.0/python/test_extra.py
+Index: eccodes-2.4.1/python/test_extra.py
===================================================================
---- eccodes-2.3.0.orig/python/test_extra.py
-+++ eccodes-2.3.0/python/test_extra.py
+--- eccodes-2.4.1.orig/python/test_extra.py
++++ eccodes-2.4.1/python/test_extra.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
@@ -360,10 +360,10 @@ Index: eccodes-2.3.0/python/test_extra.py
grib_write(gid,oid)
-Index: eccodes-2.3.0/examples/python/keys_iterator_gts.py
+Index: eccodes-2.4.1/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
+--- eccodes-2.4.1.orig/examples/python/keys_iterator_gts.py
++++ eccodes-2.4.1/examples/python/keys_iterator_gts.py
@@ -9,6 +9,7 @@
# nor does it submit to any jurisdiction.
#
@@ -391,10 +391,10 @@ Index: eccodes-2.3.0/examples/python/keys_iterator_gts.py
return 1
-Index: eccodes-2.3.0/examples/python/binary_message.py
+Index: eccodes-2.4.1/examples/python/binary_message.py
===================================================================
---- eccodes-2.3.0.orig/examples/python/binary_message.py
-+++ eccodes-2.3.0/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.
#
@@ -403,10 +403,10 @@ Index: eccodes-2.3.0/examples/python/binary_message.py
import traceback
import sys
-Index: eccodes-2.3.0/python/gribapi/gribapi.py
+Index: eccodes-2.4.1/python/gribapi/gribapi.py
===================================================================
---- eccodes-2.3.0.orig/python/gribapi/gribapi.py
-+++ eccodes-2.3.0/python/gribapi/gribapi.py
+--- eccodes-2.4.1.orig/python/gribapi/gribapi.py
++++ eccodes-2.4.1/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 ffbadab..b9a2d58 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.3.0/configure.ac
+Index: eccodes-2.4.1/configure.ac
===================================================================
---- eccodes-2.3.0.orig/configure.ac
-+++ eccodes-2.3.0/configure.ac
+--- eccodes-2.4.1.orig/configure.ac
++++ eccodes-2.4.1/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 96f7e87..3735ef0 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.1.0/CMakeLists.txt
+Index: eccodes-2.4.1/CMakeLists.txt
===================================================================
---- eccodes-2.1.0.orig/CMakeLists.txt
-+++ eccodes-2.1.0/CMakeLists.txt
-@@ -82,6 +82,12 @@ ecbuild_add_option( FEATURE FORTRAN
+--- eccodes-2.4.1.orig/CMakeLists.txt
++++ eccodes-2.4.1/CMakeLists.txt
+@@ -94,6 +94,12 @@ ecbuild_add_option( FEATURE FORTRAN
# REQUIRED_LANGUAGES Fortran # TODO
)
@@ -20,11 +20,11 @@ Index: eccodes-2.1.0/CMakeLists.txt
# TODO Remove this after REQUIRED_LANGUAGES
if( ENABLE_FORTRAN )
# will set EC_HAVE_FORTRAN with the result
-Index: eccodes-2.1.0/cmake/ecbuild_config.h.in
+Index: eccodes-2.4.1/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 @@
+--- eccodes-2.4.1.orig/cmake/ecbuild_config.h.in
++++ eccodes-2.4.1/cmake/ecbuild_config.h.in
+@@ -153,14 +153,18 @@
/* config info */
@@ -46,7 +46,7 @@ Index: eccodes-2.1.0/cmake/ecbuild_config.h.in
#define @PNAME at _BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define @PNAME at _C_COMPILER_ID "@CMAKE_C_COMPILER_ID@"
-@@ -179,9 +183,6 @@
+@@ -182,9 +186,6 @@
#define @PNAME at _INSTALL_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_LIB_DIR@"
#define @PNAME at _INSTALL_DATA_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_DATA_DIR@"
@@ -56,10 +56,10 @@ Index: eccodes-2.1.0/cmake/ecbuild_config.h.in
#cmakedefine EC_HAVE_FORTRAN
#ifdef EC_HAVE_FORTRAN
-Index: eccodes-2.1.0/cmake/ecbuild_print_summary.cmake
+Index: eccodes-2.4.1/cmake/ecbuild_print_summary.cmake
===================================================================
---- eccodes-2.1.0.orig/cmake/ecbuild_print_summary.cmake
-+++ eccodes-2.1.0/cmake/ecbuild_print_summary.cmake
+--- eccodes-2.4.1.orig/cmake/ecbuild_print_summary.cmake
++++ eccodes-2.4.1/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.1.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.1.0/cmake/ecbuild_get_date.cmake
+Index: eccodes-2.4.1/cmake/ecbuild_get_date.cmake
===================================================================
---- eccodes-2.1.0.orig/cmake/ecbuild_get_date.cmake
-+++ eccodes-2.1.0/cmake/ecbuild_get_date.cmake
+--- eccodes-2.4.1.orig/cmake/ecbuild_get_date.cmake
++++ eccodes-2.4.1/cmake/ecbuild_get_date.cmake
@@ -20,12 +20,16 @@
##############################################################################
diff --git a/debian/patches/series b/debian/patches/series
index 9d65581..888c30a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ numpy-fixes.patch
py3-fixes.patch
remove-rpms.patch
memfs.patch
-findnetcdf4-fix.patch
diff --git a/debian/patches/static-fix.patch b/debian/patches/static-fix.patch
index 52aecdb..65406e8 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.3.0/tools/mars_request.c
+Index: eccodes-2.4.1/tools/mars_request.c
===================================================================
---- eccodes-2.3.0.orig/tools/mars_request.c
-+++ eccodes-2.3.0/tools/mars_request.c
+--- eccodes-2.4.1.orig/tools/mars_request.c
++++ eccodes-2.4.1/tools/mars_request.c
@@ -13,7 +13,7 @@
#include "grib_api.h"
@@ -19,10 +19,10 @@ Index: eccodes-2.3.0/tools/mars_request.c
{
fprintf(stderr,"%s: file\n",prog);
exit(1);
-Index: eccodes-2.3.0/tools/gaussian.c
+Index: eccodes-2.4.1/tools/gaussian.c
===================================================================
---- eccodes-2.3.0.orig/tools/gaussian.c
-+++ eccodes-2.3.0/tools/gaussian.c
+--- eccodes-2.4.1.orig/tools/gaussian.c
++++ eccodes-2.4.1/tools/gaussian.c
@@ -14,7 +14,7 @@
#include "grib_api.h"
@@ -32,10 +32,10 @@ Index: eccodes-2.3.0/tools/gaussian.c
{
fprintf(stderr,"%s: N\n",prog);
exit(1);
-Index: eccodes-2.3.0/tools/grib_check_gaussian_grid.c
+Index: eccodes-2.4.1/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
+--- eccodes-2.4.1.orig/tools/grib_check_gaussian_grid.c
++++ eccodes-2.4.1/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.3.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.3.0/tools/grib_nearest_land.c
+Index: eccodes-2.4.1/tools/grib_nearest_land.c
===================================================================
---- eccodes-2.3.0.orig/tools/grib_nearest_land.c
-+++ eccodes-2.3.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
@@ -19,7 +19,7 @@
#include "grib_api_internal.h"
@@ -58,10 +58,10 @@ Index: eccodes-2.3.0/tools/grib_nearest_land.c
printf("Usage: %s latlon_file grib_orography grib_file grib_file ...\n",prog);
exit(1);
}
-Index: eccodes-2.3.0/tools/grib_tools.h
+Index: eccodes-2.4.1/tools/grib_tools.h
===================================================================
---- eccodes-2.3.0.orig/tools/grib_tools.h
-+++ eccodes-2.3.0/tools/grib_tools.h
+--- eccodes-2.4.1.orig/tools/grib_tools.h
++++ eccodes-2.4.1/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.3.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.3.0/tools/grib_compare.c
+Index: eccodes-2.4.1/tools/grib_compare.c
===================================================================
---- eccodes-2.3.0.orig/tools/grib_compare.c
-+++ eccodes-2.3.0/tools/grib_compare.c
+--- eccodes-2.4.1.orig/tools/grib_compare.c
++++ eccodes-2.4.1/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.3.0/tools/grib_compare.c
exit(1);
}
}
-Index: eccodes-2.3.0/tools/grib_options.c
+Index: eccodes-2.4.1/tools/grib_options.c
===================================================================
---- eccodes-2.3.0.orig/tools/grib_options.c
-+++ eccodes-2.3.0/tools/grib_options.c
+--- eccodes-2.4.1.orig/tools/grib_options.c
++++ eccodes-2.4.1/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,10 +159,10 @@ Index: eccodes-2.3.0/tools/grib_options.c
return GRIB_SUCCESS;
}
-Index: eccodes-2.3.0/tools/grib_to_netcdf.c
+Index: eccodes-2.4.1/tools/grib_to_netcdf.c
===================================================================
---- eccodes-2.3.0.orig/tools/grib_to_netcdf.c
-+++ eccodes-2.3.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*
}
if (kvalue->name == NULL) {
@@ -190,10 +190,10 @@ Index: eccodes-2.3.0/tools/grib_to_netcdf.c
exit(1);
}
-Index: eccodes-2.3.0/tools/bufr_compare.c
+Index: eccodes-2.4.1/tools/bufr_compare.c
===================================================================
---- eccodes-2.3.0.orig/tools/bufr_compare.c
-+++ eccodes-2.3.0/tools/bufr_compare.c
+--- eccodes-2.4.1.orig/tools/bufr_compare.c
++++ eccodes-2.4.1/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));
diff --git a/debian/patches/static-libs.patch b/debian/patches/static-libs.patch
index 5f5b845..029d8c2 100644
--- a/debian/patches/static-libs.patch
+++ b/debian/patches/static-libs.patch
@@ -4,10 +4,10 @@ Description: Build both static and dynamic libraries for Debian;
Last-Updated: 2016-04-27
Forwarded: no
-Index: eccodes-2.0.0/fortran/CMakeLists.txt
+Index: eccodes-2.4.1/fortran/CMakeLists.txt
===================================================================
---- eccodes-2.0.0.orig/fortran/CMakeLists.txt
-+++ eccodes-2.0.0/fortran/CMakeLists.txt
+--- eccodes-2.4.1.orig/fortran/CMakeLists.txt
++++ eccodes-2.4.1/fortran/CMakeLists.txt
@@ -43,6 +43,15 @@ if( HAVE_FORTRAN )
ecbuild_add_library( TARGET eccodes_f90
SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h
@@ -24,34 +24,28 @@ Index: eccodes-2.0.0/fortran/CMakeLists.txt
LIBS eccodes )
add_custom_command( TARGET eccodes_f90 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include
-Index: eccodes-2.0.0/src/CMakeLists.txt
+Index: eccodes-2.4.1/src/CMakeLists.txt
===================================================================
---- eccodes-2.0.0.orig/src/CMakeLists.txt
-+++ eccodes-2.0.0/src/CMakeLists.txt
-@@ -421,12 +421,25 @@ ecbuild_add_library(TARGET eccodes
+--- eccodes-2.4.1.orig/src/CMakeLists.txt
++++ eccodes-2.4.1/src/CMakeLists.txt
+@@ -431,7 +431,19 @@ ecbuild_add_library(TARGET eccodes
SOURCES grib_api_version.c
# griby.c gribl.c
${grib_api_srcs}
- GENERATED grib_api_version.c
+ GENERATED grib_api_version.c
-+ VERSION 0
++ VERSION 0
+ CFLAGS ${CFLAGS}
- LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
- TEMPLATES ${grib_api_extra_srcs}
- ${CMATH_LIBRARIES} )
-
-+ecbuild_add_library(TARGET eccodes_static
-+ TYPE STATIC
++ LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES}
++ TEMPLATES ${grib_api_extra_srcs})
++
++ecbuild_add_library(TARGET eccodes
++ TYPE STATIC
+ SOURCES grib_api_version.c
+ # griby.c gribl.c
+ ${grib_api_srcs}
+ GENERATED grib_api_version.c
+ CFLAGS ${CFLAGS}
-+ LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-+ TEMPLATES ${grib_api_extra_srcs}
-+ ${CMATH_LIBRARIES} )
-
-+
- install( FILES grib_api.h eccodes.h eccodes_windef.h DESTINATION ${INSTALL_INCLUDE_DIR} )
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/eccodes_version.h DESTINATION ${INSTALL_INCLUDE_DIR} )
+ LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES}
+ TEMPLATES ${grib_api_extra_srcs})
--
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