[emos] 04/13: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 3 13:54:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit e7e956103e21caa2fdcbdd7f3a29e4ad243d0504
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Nov 28 17:25:12 2016 +0000
refresh patches
---
debian/patches/build_fixes.patch | 12 ++++----
debian/patches/cmake_fixes.patch | 22 +++++++-------
debian/patches/interpol_tables_path.patch | 6 ++--
debian/patches/little_endian.patch | 6 ++--
debian/patches/pkgconfig.patch | 22 +++++++-------
debian/patches/shared.patch | 48 +++++++++++++++----------------
debian/patches/testbuild.patch | 6 ++--
7 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/debian/patches/build_fixes.patch b/debian/patches/build_fixes.patch
index e10ebef..7c297ff 100644
--- a/debian/patches/build_fixes.patch
+++ b/debian/patches/build_fixes.patch
@@ -3,10 +3,10 @@ Description: Build fix for Hurd-i386 on Debian
Last-Updated: 2015-07-09
Forwarded: no
-Index: emoslib-4.4.1/gribex/csect4.F
+Index: emoslib-4.4.5/gribex/csect4.F
===================================================================
---- emoslib-4.4.1.orig/gribex/csect4.F
-+++ emoslib-4.4.1/gribex/csect4.F
+--- emoslib-4.4.5.orig/gribex/csect4.F
++++ emoslib-4.4.5/gribex/csect4.F
@@ -308,10 +308,10 @@ C Calculate the scale and reference
#endif
#if defined hpR32 || defined (__alpha) || defined hpR64 || defined hpiaR64
@@ -21,10 +21,10 @@ Index: emoslib-4.4.1/gribex/csect4.F
#endif
ZSCALE = 2.0**ISCALE
C
-Index: emoslib-4.4.1/CMakeLists.txt
+Index: emoslib-4.4.5/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/CMakeLists.txt
-+++ emoslib-4.4.1/CMakeLists.txt
+--- emoslib-4.4.5.orig/CMakeLists.txt
++++ emoslib-4.4.5/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
# build type flags
diff --git a/debian/patches/cmake_fixes.patch b/debian/patches/cmake_fixes.patch
index 0ec8d65..1f86e27 100644
--- a/debian/patches/cmake_fixes.patch
+++ b/debian/patches/cmake_fixes.patch
@@ -25,10 +25,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: emoslib-4.4.2/cmake/project-config.cmake.in
+Index: emoslib-4.4.5/cmake/project-config.cmake.in
===================================================================
---- emoslib-4.4.2.orig/cmake/project-config.cmake.in
-+++ emoslib-4.4.2/cmake/project-config.cmake.in
+--- emoslib-4.4.5.orig/cmake/project-config.cmake.in
++++ emoslib-4.4.5/cmake/project-config.cmake.in
@@ -20,7 +20,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -64,11 +64,11 @@ Index: emoslib-4.4.2/cmake/project-config.cmake.in
- endif()
+ set( @PROJECT_NAME at _BASE_DIR @CMAKE_INSTALL_PREFIX@ )
endif()
-Index: emoslib-4.4.2/cmake/ecbuild_add_executable.cmake
+Index: emoslib-4.4.5/cmake/ecbuild_add_executable.cmake
===================================================================
---- emoslib-4.4.2.orig/cmake/ecbuild_add_executable.cmake
-+++ emoslib-4.4.2/cmake/ecbuild_add_executable.cmake
-@@ -325,7 +325,7 @@ macro( ecbuild_add_executable )
+--- emoslib-4.4.5.orig/cmake/ecbuild_add_executable.cmake
++++ emoslib-4.4.5/cmake/ecbuild_add_executable.cmake
+@@ -269,7 +269,7 @@ macro( ecbuild_add_executable )
# set build location
@@ -77,11 +77,11 @@ Index: emoslib-4.4.2/cmake/ecbuild_add_executable.cmake
# export location of target to other projects -- must be exactly after setting the build location (see previous command)
-Index: emoslib-4.4.2/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.4.5/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.4.2.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.4.2/cmake/ecbuild_add_library.cmake
-@@ -512,8 +512,8 @@ function( ecbuild_add_library_impl )
+--- emoslib-4.4.5.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.4.5/cmake/ecbuild_add_library.cmake
+@@ -476,8 +476,8 @@ function( ecbuild_add_library_impl )
# set build location
diff --git a/debian/patches/interpol_tables_path.patch b/debian/patches/interpol_tables_path.patch
index d962110..2bd587e 100644
--- a/debian/patches/interpol_tables_path.patch
+++ b/debian/patches/interpol_tables_path.patch
@@ -4,10 +4,10 @@ Description: Install INTERPOL tables into install directory; needed to keep
Last-Updated: 2015-10-28
Forwarded: no
-Index: emoslib-4.4.2/CMakeLists.txt
+Index: emoslib-4.4.5/CMakeLists.txt
===================================================================
---- emoslib-4.4.2.orig/CMakeLists.txt
-+++ emoslib-4.4.2/CMakeLists.txt
+--- emoslib-4.4.5.orig/CMakeLists.txt
++++ emoslib-4.4.5/CMakeLists.txt
@@ -258,7 +258,7 @@ ecbuild_info( "INTERPOL_TABLES_PATH: $
file( COPY tables/interpol DESTINATION ${CMAKE_BINARY_DIR}/${INSTALL_DATA_DIR}/tables )
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
index 6ebaee9..d07442b 100644
--- a/debian/patches/little_endian.patch
+++ b/debian/patches/little_endian.patch
@@ -4,10 +4,10 @@ Description: Only use LITTLE_ENDIAN on LITTLE_ENDIAN machines (make optional and
Last-Updated: 2016-02-04
Forwarded: https://software.ecmwf.int/issues/browse/SUP-1594
-Index: emoslib-4.4.2/CMakeLists.txt
+Index: emoslib-4.4.5/CMakeLists.txt
===================================================================
---- emoslib-4.4.2.orig/CMakeLists.txt
-+++ emoslib-4.4.2/CMakeLists.txt
+--- emoslib-4.4.5.orig/CMakeLists.txt
++++ emoslib-4.4.5/CMakeLists.txt
@@ -35,7 +35,7 @@ ecbuild_add_option( FEATURE LIBEMOS_BUFR
ecbuild_add_option( FEATURE LIBEMOS_INTERPOLATION DESCRIPTION "enable interpolation functionality" DEFAULT ON )
ecbuild_add_option( FEATURE LIBEMOS_GRIBEX DESCRIPTION "enable GRIBex functionality" DEFAULT ON )
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 5ad8aaf..c4d6f45 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,11 +3,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2015-05-13
Forwarded: no
-Index: emoslib-4.4.1/CMakeLists.txt
+Index: emoslib-4.4.5/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/CMakeLists.txt
-+++ emoslib-4.4.1/CMakeLists.txt
-@@ -148,6 +148,13 @@ message( STATUS "BUFR_TABLES_PATH: ${BUF
+--- emoslib-4.4.5.orig/CMakeLists.txt
++++ emoslib-4.4.5/CMakeLists.txt
+@@ -160,6 +160,13 @@ message( STATUS "BUFR_TABLES_PATH: ${BUF
# config header
ecbuild_generate_config_headers( DESTINATION ${INSTALL_INCLUDE_DIR}/libemos )
@@ -21,10 +21,10 @@ Index: emoslib-4.4.1/CMakeLists.txt
configure_file( libemos_config.h.in libemos_config.h @ONLY )
configure_file( libemos_version.h.in libemos_version.h @ONLY )
configure_file( libemos_version.c.in libemos_version.c @ONLY )
-Index: emoslib-4.4.1/cmake/emos.pc.in
+Index: emoslib-4.4.5/cmake/emos.pc.in
===================================================================
--- /dev/null
-+++ emoslib-4.4.1/cmake/emos.pc.in
++++ emoslib-4.4.5/cmake/emos.pc.in
@@ -0,0 +1,32 @@
+git_tag=@PKGCONFIG_GIT_TAG@
+
@@ -58,10 +58,10 @@ Index: emoslib-4.4.1/cmake/emos.pc.in
+Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
+Cflags: ${cflags}
+#====================================================================
-Index: emoslib-4.4.1/cmake/emosR64.pc.in
+Index: emoslib-4.4.5/cmake/emosR64.pc.in
===================================================================
--- /dev/null
-+++ emoslib-4.4.1/cmake/emosR64.pc.in
++++ emoslib-4.4.5/cmake/emosR64.pc.in
@@ -0,0 +1,32 @@
+git_tag=@PKGCONFIG_GIT_TAG@
+
@@ -95,10 +95,10 @@ Index: emoslib-4.4.1/cmake/emosR64.pc.in
+Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
+Cflags: ${cflags}
+#====================================================================
-Index: emoslib-4.4.1/cmake/ecbuild_pkgconfig.cmake
+Index: emoslib-4.4.5/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- emoslib-4.4.1.orig/cmake/ecbuild_pkgconfig.cmake
-+++ emoslib-4.4.1/cmake/ecbuild_pkgconfig.cmake
+--- emoslib-4.4.5.orig/cmake/ecbuild_pkgconfig.cmake
++++ emoslib-4.4.5/cmake/ecbuild_pkgconfig.cmake
@@ -414,8 +414,9 @@ function( ecbuild_pkgconfig )
configure_file( ${_PAR_TEMPLATE} "${CMAKE_BINARY_DIR}/${_PAR_FILENAME}" @ONLY )
ecbuild_info( "pkg-config file created: ${_PAR_FILENAME}" )
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index d100324..162594e 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -7,10 +7,10 @@ Description: Enable building shared libs in emoslib (cmake)
Last-Update: 2015-07-09
Forwarded: no
-Index: emoslib-4.4.1/libemos-sp-shared/CMakeLists.txt
+Index: emoslib-4.4.5/libemos-sp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.4.1/libemos-sp-shared/CMakeLists.txt
++++ emoslib-4.4.5/libemos-sp-shared/CMakeLists.txt
@@ -0,0 +1,21 @@
+foreach( _src ${libemos_srcs} )
+ list( APPEND emos_sp_shared_srcs ../${_src} )
@@ -33,10 +33,10 @@ Index: emoslib-4.4.1/libemos-sp-shared/CMakeLists.txt
+ LIBS grib_api_f90 grib_api_f77 grib_api
+ SOURCES ../libemos_version.c ${emos_sp_shared_srcs}
+ GENERATED ../libemos_version.c )
-Index: emoslib-4.4.1/libemos-dp-shared/CMakeLists.txt
+Index: emoslib-4.4.5/libemos-dp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.4.1/libemos-dp-shared/CMakeLists.txt
++++ emoslib-4.4.5/libemos-dp-shared/CMakeLists.txt
@@ -0,0 +1,24 @@
+# configure Fortran-based targets for double precision (compilation & linking)
+
@@ -62,11 +62,11 @@ Index: emoslib-4.4.1/libemos-dp-shared/CMakeLists.txt
+ SOURCES ../libemos_version.c ${emos_dp_shared_srcs}
+ GENERATED ../libemos_version.c )
+
-Index: emoslib-4.4.1/CMakeLists.txt
+Index: emoslib-4.4.5/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/CMakeLists.txt
-+++ emoslib-4.4.1/CMakeLists.txt
-@@ -278,6 +278,8 @@ if( HAVE_SINGLE_PRECISION )
+--- emoslib-4.4.5.orig/CMakeLists.txt
++++ emoslib-4.4.5/CMakeLists.txt
+@@ -290,6 +290,8 @@ if( HAVE_SINGLE_PRECISION )
add_subdirectory( libemos-sp )
endif()
add_subdirectory( libemos-dp )
@@ -75,20 +75,20 @@ Index: emoslib-4.4.1/CMakeLists.txt
if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI" )
set_source_files_properties( version.c PROPERTIES COMPILE_DEFINITIONS "FORTRAN_LINKER_PGI" )
-Index: emoslib-4.4.1/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.4.5/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.4.1.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.4.1/cmake/ecbuild_add_library.cmake
-@@ -148,7 +148,7 @@
+--- emoslib-4.4.5.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.4.5/cmake/ecbuild_add_library.cmake
+@@ -155,7 +155,7 @@
function( ecbuild_add_library_impl )
- set( options NOINSTALL AUTO_VERSION )
-- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
-+ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
+ set( options NOINSTALL AUTO_VERSION AUTO_SOVERSION )
+- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SOVERSION OUTPUT_NAME )
++ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SOVERSION OUTPUT_NAME SONAME SOVERSION )
set( multi_value_args SOURCES SOURCES_GLOB SOURCES_EXCLUDE_REGEX OBJECTS TEMPLATES LIBS INCLUDES PRIVATE_INCLUDES PUBLIC_INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
-@@ -317,6 +317,15 @@ function( ecbuild_add_library_impl )
+@@ -324,6 +324,15 @@ function( ecbuild_add_library_impl )
get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
if( _target_pic )
@@ -104,7 +104,7 @@ Index: emoslib-4.4.1/cmake/ecbuild_add_library.cmake
if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
endif()
-@@ -328,6 +337,13 @@ function( ecbuild_add_library_impl )
+@@ -335,6 +344,13 @@ function( ecbuild_add_library_impl )
endif()
endif()
@@ -117,11 +117,11 @@ Index: emoslib-4.4.1/cmake/ecbuild_add_library.cmake
+
# define VERSION if requested
if( DEFINED _PAR_VERSION )
- ecbuild_debug("ecbuild_add_library(${_PAR_TARGET}): set version to ${_PAR_VERSION}")
-Index: emoslib-4.4.1/libemos-dp/CMakeLists.txt
+ ecbuild_debug("ecbuild_add_library(${_PAR_TARGET}): set build version to ${_PAR_VERSION}")
+Index: emoslib-4.4.5/libemos-dp/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/libemos-dp/CMakeLists.txt
-+++ emoslib-4.4.1/libemos-dp/CMakeLists.txt
+--- emoslib-4.4.5.orig/libemos-dp/CMakeLists.txt
++++ emoslib-4.4.5/libemos-dp/CMakeLists.txt
@@ -29,6 +29,7 @@ ecbuild_add_library(
TYPE STATIC
TARGET emos
@@ -130,10 +130,10 @@ Index: emoslib-4.4.1/libemos-dp/CMakeLists.txt
DEFINITIONS ${LIBEMOS_DEFINITIONS} ${emos_interpol_tables_def}
LIBS "${GRIB_API_LIBRARIES}" "${FFTW_LIB}" ${FORTRAN_LIBRARIES}
SOURCES ../libemos_version.c ${emos_dp_srcs}
-Index: emoslib-4.4.1/libemos-sp/CMakeLists.txt
+Index: emoslib-4.4.5/libemos-sp/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/libemos-sp/CMakeLists.txt
-+++ emoslib-4.4.1/libemos-sp/CMakeLists.txt
+--- emoslib-4.4.5.orig/libemos-sp/CMakeLists.txt
++++ emoslib-4.4.5/libemos-sp/CMakeLists.txt
@@ -34,6 +34,7 @@ ecbuild_add_library(
TYPE STATIC
TARGET emos_sp
diff --git a/debian/patches/testbuild.patch b/debian/patches/testbuild.patch
index 41addf8..2d6a0df 100644
--- a/debian/patches/testbuild.patch
+++ b/debian/patches/testbuild.patch
@@ -4,10 +4,10 @@ Description: Use binaries from install location, which is where they are
Last-Updated: 2015-10-25
Forwarded: not-needed
-Index: emoslib-4.4.2/tests/bufr/CMakeLists.txt
+Index: emoslib-4.4.5/tests/bufr/CMakeLists.txt
===================================================================
---- emoslib-4.4.2.orig/tests/bufr/CMakeLists.txt
-+++ emoslib-4.4.2/tests/bufr/CMakeLists.txt
+--- emoslib-4.4.5.orig/tests/bufr/CMakeLists.txt
++++ emoslib-4.4.5/tests/bufr/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
if( TEST_BUFR_TABLES_PATH_EXISTS )
ecbuild_add_test(
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list