[emos] 03/11: Push to experimental
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 21 15:41:04 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 be699a757f9eb80fa63b9abb804e5931f0c17b8f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Mar 24 16:00:15 2017 +0000
Push to experimental
---
debian/changelog | 2 +-
debian/patches/cmake_fixes.patch | 22 ++++----
debian/patches/interpol_tables_path.patch | 8 +--
debian/patches/little_endian.patch | 8 +--
debian/patches/testbuild.patch | 85 +++++++++++++++----------------
5 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 992f8db..cfa3efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-emoslib (2:4.4.7-1) UNRELEASED; urgency=medium
+emoslib (2:4.4.7-1) experimental; urgency=medium
* New upstream release
diff --git a/debian/patches/cmake_fixes.patch b/debian/patches/cmake_fixes.patch
index 1f86e27..3ba7965 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.5/cmake/project-config.cmake.in
+Index: emoslib-4.4.7/cmake/project-config.cmake.in
===================================================================
---- emoslib-4.4.5.orig/cmake/project-config.cmake.in
-+++ emoslib-4.4.5/cmake/project-config.cmake.in
+--- emoslib-4.4.7.orig/cmake/project-config.cmake.in
++++ emoslib-4.4.7/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.5/cmake/project-config.cmake.in
- endif()
+ set( @PROJECT_NAME at _BASE_DIR @CMAKE_INSTALL_PREFIX@ )
endif()
-Index: emoslib-4.4.5/cmake/ecbuild_add_executable.cmake
+Index: emoslib-4.4.7/cmake/ecbuild_add_executable.cmake
===================================================================
---- 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 )
+--- emoslib-4.4.7.orig/cmake/ecbuild_add_executable.cmake
++++ emoslib-4.4.7/cmake/ecbuild_add_executable.cmake
+@@ -279,7 +279,7 @@ macro( ecbuild_add_executable )
# set build location
@@ -77,11 +77,11 @@ Index: emoslib-4.4.5/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.5/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.4.7/cmake/ecbuild_add_library.cmake
===================================================================
---- 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 )
+--- emoslib-4.4.7.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.4.7/cmake/ecbuild_add_library.cmake
+@@ -485,8 +485,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 2bd587e..7299a81 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.5/CMakeLists.txt
+Index: emoslib-4.4.7/CMakeLists.txt
===================================================================
---- emoslib-4.4.5.orig/CMakeLists.txt
-+++ emoslib-4.4.5/CMakeLists.txt
-@@ -258,7 +258,7 @@ ecbuild_info( "INTERPOL_TABLES_PATH: $
+--- emoslib-4.4.7.orig/CMakeLists.txt
++++ emoslib-4.4.7/CMakeLists.txt
+@@ -265,7 +265,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 d07442b..2a19871 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.5/CMakeLists.txt
+Index: emoslib-4.4.7/CMakeLists.txt
===================================================================
---- emoslib-4.4.5.orig/CMakeLists.txt
-+++ emoslib-4.4.5/CMakeLists.txt
+--- emoslib-4.4.7.orig/CMakeLists.txt
++++ emoslib-4.4.7/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.5/CMakeLists.txt
################################################################################
# compiler/linker flags
-@@ -273,12 +273,17 @@ list( APPEND LIBEMOS_DEFINITIONS
+@@ -280,12 +280,17 @@ list( APPEND LIBEMOS_DEFINITIONS
POINTER_64
_LARGEFILE64_SOURCE
_FILE_OFFSET_BITS=64
diff --git a/debian/patches/testbuild.patch b/debian/patches/testbuild.patch
index 2d6a0df..57a08bf 100644
--- a/debian/patches/testbuild.patch
+++ b/debian/patches/testbuild.patch
@@ -4,20 +4,19 @@ Description: Use binaries from install location, which is where they are
Last-Updated: 2015-10-25
Forwarded: not-needed
-Index: emoslib-4.4.5/tests/bufr/CMakeLists.txt
+Index: emoslib-4.4.7/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(
- TARGET bufr_decode_all_NotFoundTestFile
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_decode_all
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_decode_all
- ARGS -i "NotFoundTestFile.bufr"
- ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
- set_tests_properties( bufr_decode_all_NotFoundTestFile PROPERTIES WILL_FAIL TRUE )
-@@ -31,7 +31,7 @@ endif()
+--- emoslib-4.4.7.orig/tests/bufr/CMakeLists.txt
++++ emoslib-4.4.7/tests/bufr/CMakeLists.txt
+@@ -20,14 +20,14 @@ endif()
+ # FIXME: add PROPERTIES to ecbuild_add_test()
+ ecbuild_add_test(
+ TARGET bufr_decode_all_NotFoundTestFile
+- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_decode_all
++ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_decode_all
+ ARGS -i "NotFoundTestFile.bufr"
+ ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
+ set_tests_properties( bufr_decode_all_NotFoundTestFile PROPERTIES WILL_FAIL TRUE )
ecbuild_add_test(
TARGET bufr_decode_all_NotFoundTablesPath
@@ -26,7 +25,7 @@ Index: emoslib-4.4.5/tests/bufr/CMakeLists.txt
ARGS -i ${PROJECT_SOURCE_DIR}/tests/bufr/data/temp_101.bufr
ENVIRONMENT "BUFR_TABLES=NotFoundTablesPath/" )
set_tests_properties( bufr_decode_all_NotFoundTablesPath PROPERTIES WILL_FAIL TRUE )
-@@ -42,7 +42,7 @@ set_tests_properties( bufr_decode_all_No
+@@ -38,7 +38,7 @@ set_tests_properties( bufr_decode_all_No
set( data ${PROJECT_SOURCE_DIR}/tests/bufr/data )
ecbuild_add_test(
TARGET emoslib_bufr_filter_NotFoundTablesPath
@@ -35,37 +34,37 @@ Index: emoslib-4.4.5/tests/bufr/CMakeLists.txt
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 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 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}" )
+@@ -48,17 +48,17 @@ set_tests_properties(
+ # unit tests: bufr_filter
+ ecbuild_add_test(
+ 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 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 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}" )
+
+@@ -76,7 +76,7 @@ foreach( bufr_file
+ "tracks_15U_ITA_2014041012.det.bufr4" )
ecbuild_add_test(
- 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
+ TARGET "bufr_decode_all_${bufr_file}"
+- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_decode_all
++ COMMAND ${CMAKE_INTALL_PREFIX}/bin/bufr_decode_all
+ ARGS -i "${data}/${bufr_file}"
+ TEST_DEPENDS download_tests_bufr_src_files
ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
-
-@@ -82,7 +82,7 @@ if( TEST_BUFR_TABLES_PATH_EXISTS )
- "tracks_15U_ITA_2014041012.det.bufr4" )
- ecbuild_add_test(
- TARGET "bufr_decode_all_${bufr_file}"
-- COMMAND ${CMAKE_BINARY_DIR}/bin/bufr_decode_all
-+ COMMAND ${CMAKE_INSTALL_PREFIX}/bin/bufr_decode_all
- ARGS -i "${data}/${bufr_file}"
- TEST_DEPENDS download_tests_bufr_src_files
- ENVIRONMENT "BUFR_TABLES=${TEST_BUFR_TABLES_PATH}" )
-@@ -147,16 +147,16 @@ if( FALSE )
+@@ -139,16 +139,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