[emos] 03/06: Update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Aug 30 10:51:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit e32f2fcbc2b31f34fbfc28441d147b865cedd950
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jul 7 22:11:59 2016 +0100
Update patches
---
debian/patches/cmake_fixes.patch | 18 ++++++++--------
debian/patches/disable-test-downloads.patch | 0
debian/patches/interpol_tables_path.patch | 8 ++++----
debian/patches/little_endian.patch | 8 ++++----
debian/patches/series | 1 -
debian/patches/testbuild.patch | 32 ++++++++++++++---------------
6 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/debian/patches/cmake_fixes.patch b/debian/patches/cmake_fixes.patch
index c076be2..0ec8d65 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.1/cmake/project-config.cmake.in
+Index: emoslib-4.4.2/cmake/project-config.cmake.in
===================================================================
---- emoslib-4.4.1.orig/cmake/project-config.cmake.in
-+++ emoslib-4.4.1/cmake/project-config.cmake.in
+--- emoslib-4.4.2.orig/cmake/project-config.cmake.in
++++ emoslib-4.4.2/cmake/project-config.cmake.in
@@ -20,7 +20,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -64,10 +64,10 @@ Index: emoslib-4.4.1/cmake/project-config.cmake.in
- endif()
+ set( @PROJECT_NAME at _BASE_DIR @CMAKE_INSTALL_PREFIX@ )
endif()
-Index: emoslib-4.4.1/cmake/ecbuild_add_executable.cmake
+Index: emoslib-4.4.2/cmake/ecbuild_add_executable.cmake
===================================================================
---- emoslib-4.4.1.orig/cmake/ecbuild_add_executable.cmake
-+++ emoslib-4.4.1/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 )
# set build location
@@ -77,10 +77,10 @@ Index: emoslib-4.4.1/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.1/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.4.2/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.4.1.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.4.1/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 )
# set build location
diff --git a/debian/patches/disable-test-downloads.patch b/debian/patches/disable-test-downloads.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/interpol_tables_path.patch b/debian/patches/interpol_tables_path.patch
index 26c03de..d962110 100644
--- a/debian/patches/interpol_tables_path.patch
+++ b/debian/patches/interpol_tables_path.patch
@@ -4,11 +4,11 @@ Description: Install INTERPOL tables into install directory; needed to keep
Last-Updated: 2015-10-28
Forwarded: no
-Index: emoslib-4.4.1/CMakeLists.txt
+Index: emoslib-4.4.2/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/CMakeLists.txt
-+++ emoslib-4.4.1/CMakeLists.txt
-@@ -246,7 +246,7 @@ ecbuild_info( "INTERPOL_TABLES_PATH: $
+--- emoslib-4.4.2.orig/CMakeLists.txt
++++ emoslib-4.4.2/CMakeLists.txt
+@@ -258,7 +258,7 @@ ecbuild_info( "INTERPOL_TABLES_PATH: $
file( COPY tables/interpol DESTINATION ${CMAKE_BINARY_DIR}/${INSTALL_DATA_DIR}/tables )
# always install tables/interpol
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
index c20ce62..6ebaee9 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.1/CMakeLists.txt
+Index: emoslib-4.4.2/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/CMakeLists.txt
-+++ emoslib-4.4.1/CMakeLists.txt
+--- emoslib-4.4.2.orig/CMakeLists.txt
++++ emoslib-4.4.2/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 )
@@ -17,7 +17,7 @@ Index: emoslib-4.4.1/CMakeLists.txt
################################################################################
# compiler/linker flags
-@@ -261,12 +261,17 @@ list( APPEND LIBEMOS_DEFINITIONS
+@@ -273,12 +273,17 @@ list( APPEND LIBEMOS_DEFINITIONS
POINTER_64
_LARGEFILE64_SOURCE
_FILE_OFFSET_BITS=64
diff --git a/debian/patches/series b/debian/patches/series
index b420c42..3637026 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,5 @@ shared.patch
build_fixes.patch
cmake_fixes.patch
testbuild.patch
-disable-test-downloads.patch
interpol_tables_path.patch
little_endian.patch
diff --git a/debian/patches/testbuild.patch b/debian/patches/testbuild.patch
index 3b8e33d..41addf8 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.1/tests/bufr/CMakeLists.txt
+Index: emoslib-4.4.2/tests/bufr/CMakeLists.txt
===================================================================
---- emoslib-4.4.1.orig/tests/bufr/CMakeLists.txt
-+++ emoslib-4.4.1/tests/bufr/CMakeLists.txt
+--- emoslib-4.4.2.orig/tests/bufr/CMakeLists.txt
++++ emoslib-4.4.2/tests/bufr/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
if( TEST_BUFR_TABLES_PATH_EXISTS )
ecbuild_add_test(
@@ -29,30 +29,30 @@ Index: emoslib-4.4.1/tests/bufr/CMakeLists.txt
@@ -42,7 +42,7 @@ set_tests_properties( bufr_decode_all_No
set( data ${PROJECT_SOURCE_DIR}/tests/bufr/data )
ecbuild_add_test(
- TARGET bufr_filter_NotFoundTablesPath
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_filter
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_filter
+ TARGET emoslib_bufr_filter_NotFoundTablesPath
+- COMMAND ${CMAKE_BINARY_DIR}/bin/emoslib_bufr_filter
++ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/emoslib_bufr_filter
ARGS -r "${data}/request" -i "${data}/CRYO00012015020412.DC1.DAT" -o /dev/null
ENVIRONMENT "BUFR_TABLES=NotFoundTablesPath/" )
set_tests_properties(
@@ -54,17 +54,17 @@ if( TEST_BUFR_TABLES_PATH_EXISTS )
# unit tests: bufr_filter
ecbuild_add_test(
- TARGET bufr_filter_NotFoundTestFile
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_filter
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_filter
+ TARGET emoslib_bufr_filter_NotFoundTestFile
+- COMMAND ${CMAKE_BINARY_DIR}/bin/emoslib_bufr_filter
++ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/emoslib_bufr_filter
ARGS -r "${data}/request" -i "NotFoundTestFile" -o /dev/null
ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
ecbuild_add_test(
- TARGET bufr_filter_NotFoundRequest
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_filter
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_filter
+ TARGET emoslib_bufr_filter_NotFoundRequest
+- COMMAND ${CMAKE_BINARY_DIR}/bin/emoslib_bufr_filter
++ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/emoslib_bufr_filter
ARGS -r "NotFoundRequest" -i "${data}/CRYO00012015020412.DC1.DAT" -o /dev/null
ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
ecbuild_add_test(
- TARGET bufr_filter_CRYO00012015020412.DC1.DAT
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_filter
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_filter
+ TARGET emoslib_bufr_filter_CRYO00012015020412.DC1.DAT
+- COMMAND ${CMAKE_BINARY_DIR}/bin/emoslib_bufr_filter
++ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/emoslib_bufr_filter
ARGS -r "${data}/request" -i "${data}/CRYO00012015020412.DC1.DAT" -o /dev/null
ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
@@ -65,7 +65,7 @@ Index: emoslib-4.4.1/tests/bufr/CMakeLists.txt
ARGS -i "${data}/${bufr_file}"
TEST_DEPENDS download_tests_bufr_src_files
ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
-@@ -101,16 +101,16 @@ if( FALSE )
+@@ -147,16 +147,16 @@ if( FALSE )
set( in "${PROJECT_SOURCE_DIR}/tests/bufr/data/tracks_05W_PEIPAH_2014041000.fm" )
set( ref "${PROJECT_SOURCE_DIR}/tests/bufr/data/tracks_05W_PEIPAH_2014041000.eps.bufr" )
set( out "tracks_05W_PEIPAH_2014041000.eps.bufr" )
--
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