[emos] 06/14: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Mar 2 11:41:29 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 27e1c75383715a623654da4558fc66fc65e0b8d6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Feb 3 12:42:14 2016 +0000
refresh patches
---
debian/patches/bufrnum.patch | 14 +--
debian/patches/build_fixes.patch | 22 ++--
debian/patches/cmake_fixes.patch | 22 ++--
debian/patches/disable-test-downloads.patch | 10 +-
debian/patches/drop_tune.patch | 22 ++--
debian/patches/interpol_tables_path.patch | 8 +-
debian/patches/links-fix.patch | 185 ++++++++++++++++------------
debian/patches/little_endian.patch | 32 ++---
debian/patches/pkgconfig.patch | 22 ++--
debian/patches/shared.patch | 53 ++++----
debian/patches/testbuild.patch | 12 +-
11 files changed, 219 insertions(+), 183 deletions(-)
diff --git a/debian/patches/bufrnum.patch b/debian/patches/bufrnum.patch
index fcdc110..aeb3969 100644
--- a/debian/patches/bufrnum.patch
+++ b/debian/patches/bufrnum.patch
@@ -8,10 +8,10 @@ Last-Updated: 2015-05-13
# emoscyc.F used BUFRNUM, but it was never defined; I've defined it here
# matching gribnum, intpnum, etc.
# -- AMCK, 2009-04-16
-Index: emoslib-4.3.3/bufrdc_wmo/bufrnum.F
+Index: emoslib-4.3.7/bufrdc_wmo/bufrnum.F
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/bufrdc_wmo/bufrnum.F
++++ emoslib-4.3.7/bufrdc_wmo/bufrnum.F
@@ -0,0 +1,122 @@
+C
+C
@@ -135,10 +135,10 @@ Index: emoslib-4.3.3/bufrdc_wmo/bufrnum.F
+C
+ RETURN
+ END
-Index: emoslib-4.3.3/bufrdc_wmo/grprs.h
+Index: emoslib-4.3.7/bufrdc_wmo/grprs.h
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/bufrdc_wmo/grprs.h
++++ emoslib-4.3.7/bufrdc_wmo/grprs.h
@@ -0,0 +1,7 @@
+C
+C Common blocks holding default or user supplied values for printing.
@@ -147,10 +147,10 @@ Index: emoslib-4.3.3/bufrdc_wmo/grprs.h
+ INTEGER GRPRSM
+C
+ COMMON /GRPRSCM/ GRPRSM, GRPRSET
-Index: emoslib-4.3.3/bufrdc_wmo/CMakeLists.txt
+Index: emoslib-4.3.7/bufrdc_wmo/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/bufrdc_wmo/CMakeLists.txt
-+++ emoslib-4.3.3/bufrdc_wmo/CMakeLists.txt
+--- emoslib-4.3.7.orig/bufrdc_wmo/CMakeLists.txt
++++ emoslib-4.3.7/bufrdc_wmo/CMakeLists.txt
@@ -2,6 +2,7 @@
# Sources for bufrdc
#
diff --git a/debian/patches/build_fixes.patch b/debian/patches/build_fixes.patch
index 22aed5f..9e6b9be 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.3.3/gribex/csect4.F
+Index: emoslib-4.3.7/gribex/csect4.F
===================================================================
---- emoslib-4.3.3.orig/gribex/csect4.F
-+++ emoslib-4.3.3/gribex/csect4.F
+--- emoslib-4.3.7.orig/gribex/csect4.F
++++ emoslib-4.3.7/gribex/csect4.F
@@ -304,10 +304,10 @@ C Calculate the scale and reference
#endif
#if defined hpR32 || defined (__alpha) || defined hpR64 || defined hpiaR64
@@ -21,16 +21,16 @@ Index: emoslib-4.3.3/gribex/csect4.F
#endif
ZSCALE = 2.0**ISCALE
C
-Index: emoslib-4.3.3/CMakeLists.txt
+Index: emoslib-4.3.7/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/CMakeLists.txt
-+++ emoslib-4.3.3/CMakeLists.txt
-@@ -61,7 +61,7 @@ endif()
+--- emoslib-4.3.7.orig/CMakeLists.txt
++++ emoslib-4.3.7/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
# build type flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
- ecbuild_add_fortran_flags("-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -Wunused-variable -DSHAREDMEMORY")
-+ ecbuild_add_fortran_flags("-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -Wunused-variable -DSHAREDMEMORY ${BUILD_FLAGS}" )
- ecbuild_add_fortran_flags("-O2" BUILD RELEASE)
- ecbuild_add_fortran_flags("-g -O2" BUILD RELWITHDEBINFO)
- ecbuild_add_fortran_flags("-g" BUILD DEBUG)
++ ecbuild_add_fortran_flags("-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -Wunused-variable -DSHAREDMEMORY ${BUILD_FLAGS}")
+ ecbuild_add_fortran_flags("-O2" BUILD RELEASE)
+ ecbuild_add_fortran_flags("-O2" BUILD RELWITHDEBINFO)
+ ecbuild_add_fortran_flags("-g" BUILD RELWITHDEBINFO)
diff --git a/debian/patches/cmake_fixes.patch b/debian/patches/cmake_fixes.patch
index 8f465f3..fc91093 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.3.3/cmake/project-config.cmake.in
+Index: emoslib-4.3.7/cmake/project-config.cmake.in
===================================================================
---- emoslib-4.3.3.orig/cmake/project-config.cmake.in
-+++ emoslib-4.3.3/cmake/project-config.cmake.in
+--- emoslib-4.3.7.orig/cmake/project-config.cmake.in
++++ emoslib-4.3.7/cmake/project-config.cmake.in
@@ -18,7 +18,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -64,11 +64,11 @@ Index: emoslib-4.3.3/cmake/project-config.cmake.in
- endif()
+ set( @PROJECT_NAME at _BASE_DIR @CMAKE_INSTALL_PREFIX@ )
endif()
-Index: emoslib-4.3.3/cmake/ecbuild_add_executable.cmake
+Index: emoslib-4.3.7/cmake/ecbuild_add_executable.cmake
===================================================================
---- emoslib-4.3.3.orig/cmake/ecbuild_add_executable.cmake
-+++ emoslib-4.3.3/cmake/ecbuild_add_executable.cmake
-@@ -319,7 +319,7 @@ macro( ecbuild_add_executable )
+--- emoslib-4.3.7.orig/cmake/ecbuild_add_executable.cmake
++++ emoslib-4.3.7/cmake/ecbuild_add_executable.cmake
+@@ -248,7 +248,7 @@ macro( ecbuild_add_executable )
# set build location
@@ -77,11 +77,11 @@ Index: emoslib-4.3.3/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.3.3/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.3.7/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.3.3.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.3.3/cmake/ecbuild_add_library.cmake
-@@ -499,8 +499,8 @@ function( ecbuild_add_library_impl )
+--- emoslib-4.3.7.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.3.7/cmake/ecbuild_add_library.cmake
+@@ -425,8 +425,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
index 16fb890..1ba72cb 100644
--- a/debian/patches/disable-test-downloads.patch
+++ b/debian/patches/disable-test-downloads.patch
@@ -1,8 +1,8 @@
-Index: emoslib-4.3.3/tests/CMakeLists.txt
+Index: emoslib-4.3.7/tests/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/tests/CMakeLists.txt
-+++ emoslib-4.3.3/tests/CMakeLists.txt
-@@ -392,9 +392,9 @@ if( HAVE_TESTS AND HAVE_LIBEMOS_BUFRDC )
+--- emoslib-4.3.7.orig/tests/CMakeLists.txt
++++ emoslib-4.3.7/tests/CMakeLists.txt
+@@ -401,9 +401,9 @@ if( HAVE_LIBEMOS_BUFRDC )
endif()
# download bufr test files
@@ -15,7 +15,7 @@ Index: emoslib-4.3.3/tests/CMakeLists.txt
# This must be here or set_tests_properties() may fail
# FIXME: add PROPERTIES to ecbuild_add_test()
-@@ -415,15 +415,15 @@ if( HAVE_TESTS AND HAVE_LIBEMOS_BUFRDC )
+@@ -424,15 +424,15 @@ if( HAVE_LIBEMOS_BUFRDC )
ENVIRONMENT BUFR_TABLES="NotFoundTablesPath/" )
set_tests_properties( bufr_decode_all_NotFoundTablesPath PROPERTIES WILL_FAIL TRUE )
diff --git a/debian/patches/drop_tune.patch b/debian/patches/drop_tune.patch
index bfed9c0..137560c 100644
--- a/debian/patches/drop_tune.patch
+++ b/debian/patches/drop_tune.patch
@@ -3,18 +3,18 @@ Description: Drop tune=native which breaks on s390x, and is a bad idea in genera
Last-Updated: 2016-01-01
Forwarded: no
-Index: emoslib-4.3.3/CMakeLists.txt
+Index: emoslib-4.3.7/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/CMakeLists.txt
-+++ emoslib-4.3.3/CMakeLists.txt
-@@ -62,8 +62,8 @@ endif()
+--- emoslib-4.3.7.orig/CMakeLists.txt
++++ emoslib-4.3.7/CMakeLists.txt
+@@ -64,8 +64,8 @@ endif()
# build type flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
ecbuild_add_fortran_flags("-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -Wunused-variable -DSHAREDMEMORY")
-- ecbuild_add_fortran_flags("-O2 -mtune=native" BUILD RELEASE)
-- ecbuild_add_fortran_flags("-g -O2 -mtune=native" BUILD RELWITHDEBINFO)
-+ ecbuild_add_fortran_flags("-O2" BUILD RELEASE)
-+ ecbuild_add_fortran_flags("-g -O2" BUILD RELWITHDEBINFO)
- ecbuild_add_fortran_flags("-g" BUILD DEBUG)
- set(emos_special_compiler_def "gfortran")
- elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
+- ecbuild_add_fortran_flags("-O2 -mtune=native" BUILD RELEASE)
+- ecbuild_add_fortran_flags("-O2 -mtune=native" BUILD RELWITHDEBINFO)
++ ecbuild_add_fortran_flags("-O2" BUILD RELEASE)
++ ecbuild_add_fortran_flags("-O2" BUILD RELWITHDEBINFO)
+ ecbuild_add_fortran_flags("-g" BUILD RELWITHDEBINFO)
+ ecbuild_add_fortran_flags("-g" BUILD DEBUG)
+ # ecbuild_remove_fortran_flags("-fcheck=bounds" BUILD DEBUG)
diff --git a/debian/patches/interpol_tables_path.patch b/debian/patches/interpol_tables_path.patch
index 81d3b20..0b486af 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.3.3/CMakeLists.txt
+Index: emoslib-4.3.7/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/CMakeLists.txt
-+++ emoslib-4.3.3/CMakeLists.txt
-@@ -233,7 +233,7 @@ message( STATUS "INTERPOL_TABLES_PATH: $
+--- emoslib-4.3.7.orig/CMakeLists.txt
++++ emoslib-4.3.7/CMakeLists.txt
+@@ -241,7 +241,7 @@ message( STATUS "INTERPOL_TABLES_PATH: $
file( COPY tables/interpol DESTINATION ${CMAKE_BINARY_DIR}/${INSTALL_DATA_DIR}/tables )
# always install tables/interpol
diff --git a/debian/patches/links-fix.patch b/debian/patches/links-fix.patch
index 78f4100..49989b3 100644
--- a/debian/patches/links-fix.patch
+++ b/debian/patches/links-fix.patch
@@ -1,8 +1,8 @@
-Index: emoslib-4.3.3/bufrtables/links.sh
+Index: emoslib-4.3.7/bufrtables/links.sh
===================================================================
---- emoslib-4.3.3.orig/bufrtables/links.sh
-+++ emoslib-4.3.3/bufrtables/links.sh
-@@ -1,7034 +1,7034 @@
+--- emoslib-4.3.7.orig/bufrtables/links.sh
++++ emoslib-4.3.7/bufrtables/links.sh
+@@ -1,7046 +1,7046 @@
-ln -s B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000000000.TXT
-ln -s B_7854bdfd1d0b55c438ec71990fbea158.distinct B0000000000000002000.TXT
-ln -s B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000004000.TXT
@@ -25,6 +25,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s B_050f4028a43495e52440d17656e5700c.distinct B0000000000000022000.TXT
-ln -s B_365ab9afedb6b68f014f6b4c4e95310b.distinct B0000000000000023000.TXT
-ln -s B_9bfcb1e96d7c2e6025837b0885b7f1e4.distinct B0000000000000024000.TXT
+-ln -s B_4851e63ae80dfa0465a5c0accadb59c7.distinct B0000000000000025000.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001010001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001011001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001012001.TXT
@@ -78,82 +79,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007011001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007012001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007013001.TXT
-+ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000000000.TXT
-+ln -sf B_7854bdfd1d0b55c438ec71990fbea158.distinct B0000000000000002000.TXT
-+ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000004000.TXT
-+ln -sf B_172495a28a33e613f0ab1cae797bdb8a.distinct B0000000000000006000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000007000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000008000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000009000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000010000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000011000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000012000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000013000.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000000014000.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000000015000.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000000016000.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000000017000.TXT
-+ln -sf B_2c9ba7f915cf8796710557780604290b.distinct B0000000000000018000.TXT
-+ln -sf B_a5c81d91f7c1357d530c0a8f8c8dcdb0.distinct B0000000000000019000.TXT
-+ln -sf B_65afb2f73c2bd71057520b0ecba04f2a.distinct B0000000000000020000.TXT
-+ln -sf B_ebc7e71fcb4772e2325cb4f40621ee4b.distinct B0000000000000021000.TXT
-+ln -sf B_050f4028a43495e52440d17656e5700c.distinct B0000000000000022000.TXT
-+ln -sf B_365ab9afedb6b68f014f6b4c4e95310b.distinct B0000000000000023000.TXT
-+ln -sf B_9bfcb1e96d7c2e6025837b0885b7f1e4.distinct B0000000000000024000.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000001014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000001015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000001016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000001017001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000002014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000002015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000002016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000002017001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000003014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000003015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000003016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000003017001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000004014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000004015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000004016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000004017001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000005014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000005015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000005016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000005017001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006013001.TXT
-+ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000006014001.TXT
-+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000006015001.TXT
-+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000006016001.TXT
-+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000006017001.TXT
-+ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000007002001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007010001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007011001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007012001.TXT
-+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007013001.TXT
- ln -s B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000007014001.TXT
+-ln -s B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000007014001.TXT
-ln -s B_419fd0728f091193ac01265d974feadb.distinct B0000000000007015001.TXT
-ln -s B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000007016001.TXT
-ln -s B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000007017001.TXT
@@ -935,6 +861,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s B_d519a21cc26558fbfbcae5e5aae942dd.distinct B0000000000098024002.TXT
-ln -s B_4c2fd16b160e3e8368bae800b4737531.distinct B0000000000098024003.TXT
-ln -s B_ddbe264d6831c71bf60f55118905d5eb.distinct B0000000000098024101.TXT
+-ln -s B_447ec2596e66dd32d2e9f75206ecf377.distinct B0000000000098025001.TXT
+-ln -s B_743c8d7004186d6caa4cc90f3b2fada1.distinct B0000000000098025002.TXT
+-ln -s B_f10ebfdd137c45c773fb05ae41c11aac.distinct B0000000000098025101.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099010001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099011001.TXT
-ln -s B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099012001.TXT
@@ -2463,6 +2392,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s C_b7fa1a7727369ecf09b368eae9f63585.distinct C0000000000000022000.TXT
-ln -s C_8aa5c5c950f5d48836a11233c86a362d.distinct C0000000000000023000.TXT
-ln -s C_116764873185b2db63915296e10b6177.distinct C0000000000000024000.TXT
+-ln -s C_cbbfb0961719d91837e879725606f888.distinct C0000000000000025000.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001010001.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001011001.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001012001.TXT
@@ -3292,6 +3222,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s C_6c72ae004019317bfff1a124a7d22982.distinct C0000000000098024002.TXT
-ln -s C_6471810f3864afa93fb3e1759e4b2415.distinct C0000000000098024003.TXT
-ln -s C_dd5c45a988eac89a8e8e692d3ec13ad3.distinct C0000000000098024101.TXT
+-ln -s C_28dcf02601e27183968edca962cea54b.distinct C0000000000098025001.TXT
+-ln -s C_0af6a5953f106b2e629790deb9e5d160.distinct C0000000000098025002.TXT
+-ln -s C_52e7c7c26f18619d3a5aab4622ff5ded.distinct C0000000000098025101.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099010001.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099011001.TXT
-ln -s C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099012001.TXT
@@ -4771,6 +4704,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s D_bb99e30d62bf95ef8f97567958d44e1c.distinct D0000000000000022000.TXT
-ln -s D_8329c50ae1dd4e0c1c9a5060a5b9e0b1.distinct D0000000000000023000.TXT
-ln -s D_4cf72028cf96f271998949b4ff6b275e.distinct D0000000000000024000.TXT
+-ln -s D_b907356b269f584470d86dd66c0c511b.distinct D0000000000000025000.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001010001.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001011001.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001012001.TXT
@@ -5606,6 +5540,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s D_d1336aa38690b760533d2b96352e2130.distinct D0000000000098024002.TXT
-ln -s D_ef9057f8866d2ad1d22cfc09fd15cd2a.distinct D0000000000098024003.TXT
-ln -s D_d87c60652ddb0d347b093ac29d37caad.distinct D0000000000098024101.TXT
+-ln -s D_37330e819864b322b4bd32c5637e6c3f.distinct D0000000000098025001.TXT
+-ln -s D_30035205012784a0c6916eebd0384d27.distinct D0000000000098025002.TXT
+-ln -s D_67aa10c5ca69200995cb56453d1af238.distinct D0000000000098025101.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099010001.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099011001.TXT
-ln -s D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099012001.TXT
@@ -7112,6 +7049,83 @@ Index: emoslib-4.3.3/bufrtables/links.sh
-ln -s D_a189cf1bd6fbda79986901f4333f0112.distinct D2530000000098006001.TXT
-ln -s D_a189cf1bd6fbda79986901f4333f0112.distinct D2540000000098006001.TXT
-ln -s D_a189cf1bd6fbda79986901f4333f0112.distinct D2550000000098006001.TXT
++ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000000000.TXT
++ln -sf B_7854bdfd1d0b55c438ec71990fbea158.distinct B0000000000000002000.TXT
++ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000000004000.TXT
++ln -sf B_172495a28a33e613f0ab1cae797bdb8a.distinct B0000000000000006000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000007000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000008000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000009000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000010000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000011000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000012000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000000013000.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000000014000.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000000015000.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000000016000.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000000017000.TXT
++ln -sf B_2c9ba7f915cf8796710557780604290b.distinct B0000000000000018000.TXT
++ln -sf B_a5c81d91f7c1357d530c0a8f8c8dcdb0.distinct B0000000000000019000.TXT
++ln -sf B_65afb2f73c2bd71057520b0ecba04f2a.distinct B0000000000000020000.TXT
++ln -sf B_ebc7e71fcb4772e2325cb4f40621ee4b.distinct B0000000000000021000.TXT
++ln -sf B_050f4028a43495e52440d17656e5700c.distinct B0000000000000022000.TXT
++ln -sf B_365ab9afedb6b68f014f6b4c4e95310b.distinct B0000000000000023000.TXT
++ln -sf B_9bfcb1e96d7c2e6025837b0885b7f1e4.distinct B0000000000000024000.TXT
++ln -sf B_4851e63ae80dfa0465a5c0accadb59c7.distinct B0000000000000025000.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000001013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000001014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000001015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000001016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000001017001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000002013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000002014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000002015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000002016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000002017001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000003013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000003014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000003015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000003016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000003017001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000004013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000004014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000004015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000004016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000004017001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000005013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000005014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000005015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000005016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000005017001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000006013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000006014001.TXT
++ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000006015001.TXT
++ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000006016001.TXT
++ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000006017001.TXT
++ln -sf B_feb89e9c2ae53afd3b24750c7eb1e117.distinct B0000000000007002001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007010001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007011001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007012001.TXT
++ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000007013001.TXT
++ln -sf B_a73bff54ea6f9b81d2ddfb9a12a374ca.distinct B0000000000007014001.TXT
+ln -sf B_419fd0728f091193ac01265d974feadb.distinct B0000000000007015001.TXT
+ln -sf B_d4c990866c54fe08d88f5ce51b388b92.distinct B0000000000007016001.TXT
+ln -sf B_e0a53212e9fdc2bcd5d570840a13f4e1.distinct B0000000000007017001.TXT
@@ -7893,6 +7907,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
+ln -sf B_d519a21cc26558fbfbcae5e5aae942dd.distinct B0000000000098024002.TXT
+ln -sf B_4c2fd16b160e3e8368bae800b4737531.distinct B0000000000098024003.TXT
+ln -sf B_ddbe264d6831c71bf60f55118905d5eb.distinct B0000000000098024101.TXT
++ln -sf B_447ec2596e66dd32d2e9f75206ecf377.distinct B0000000000098025001.TXT
++ln -sf B_743c8d7004186d6caa4cc90f3b2fada1.distinct B0000000000098025002.TXT
++ln -sf B_f10ebfdd137c45c773fb05ae41c11aac.distinct B0000000000098025101.TXT
+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099010001.TXT
+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099011001.TXT
+ln -sf B_47972c7924f05d5facc57044fc806c61.distinct B0000000000099012001.TXT
@@ -9421,6 +9438,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
+ln -sf C_b7fa1a7727369ecf09b368eae9f63585.distinct C0000000000000022000.TXT
+ln -sf C_8aa5c5c950f5d48836a11233c86a362d.distinct C0000000000000023000.TXT
+ln -sf C_116764873185b2db63915296e10b6177.distinct C0000000000000024000.TXT
++ln -sf C_cbbfb0961719d91837e879725606f888.distinct C0000000000000025000.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001010001.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001011001.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000001012001.TXT
@@ -10250,6 +10268,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
+ln -sf C_6c72ae004019317bfff1a124a7d22982.distinct C0000000000098024002.TXT
+ln -sf C_6471810f3864afa93fb3e1759e4b2415.distinct C0000000000098024003.TXT
+ln -sf C_dd5c45a988eac89a8e8e692d3ec13ad3.distinct C0000000000098024101.TXT
++ln -sf C_28dcf02601e27183968edca962cea54b.distinct C0000000000098025001.TXT
++ln -sf C_0af6a5953f106b2e629790deb9e5d160.distinct C0000000000098025002.TXT
++ln -sf C_52e7c7c26f18619d3a5aab4622ff5ded.distinct C0000000000098025101.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099010001.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099011001.TXT
+ln -sf C_09898434dcb4dc98ec72b1bc92727b4c.distinct C0000000000099012001.TXT
@@ -11729,6 +11750,7 @@ Index: emoslib-4.3.3/bufrtables/links.sh
+ln -sf D_bb99e30d62bf95ef8f97567958d44e1c.distinct D0000000000000022000.TXT
+ln -sf D_8329c50ae1dd4e0c1c9a5060a5b9e0b1.distinct D0000000000000023000.TXT
+ln -sf D_4cf72028cf96f271998949b4ff6b275e.distinct D0000000000000024000.TXT
++ln -sf D_b907356b269f584470d86dd66c0c511b.distinct D0000000000000025000.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001010001.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001011001.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000001012001.TXT
@@ -12564,6 +12586,9 @@ Index: emoslib-4.3.3/bufrtables/links.sh
+ln -sf D_d1336aa38690b760533d2b96352e2130.distinct D0000000000098024002.TXT
+ln -sf D_ef9057f8866d2ad1d22cfc09fd15cd2a.distinct D0000000000098024003.TXT
+ln -sf D_d87c60652ddb0d347b093ac29d37caad.distinct D0000000000098024101.TXT
++ln -sf D_37330e819864b322b4bd32c5637e6c3f.distinct D0000000000098025001.TXT
++ln -sf D_30035205012784a0c6916eebd0384d27.distinct D0000000000098025002.TXT
++ln -sf D_67aa10c5ca69200995cb56453d1af238.distinct D0000000000098025101.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099010001.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099011001.TXT
+ln -sf D_df21a931ba159c58c3b9b00236baac59.distinct D0000000000099012001.TXT
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
index 078788f..170fc5e 100644
--- a/debian/patches/little_endian.patch
+++ b/debian/patches/little_endian.patch
@@ -4,10 +4,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2011-12-09
Forwarded: no
-Index: emoslib-4.3.3/gribex/ecloc1.F
+Index: emoslib-4.3.7/gribex/ecloc1.F
===================================================================
---- emoslib-4.3.3.orig/gribex/ecloc1.F
-+++ emoslib-4.3.3/gribex/ecloc1.F
+--- emoslib-4.3.7.orig/gribex/ecloc1.F
++++ emoslib-4.3.7/gribex/ecloc1.F
@@ -69,7 +69,7 @@ C CSGNBT - encode sign bit
C DSGNBT - decode sign bit
C ELDEFS - encode ECMWF section 1, local usage definitions
@@ -17,10 +17,10 @@ Index: emoslib-4.3.3/gribex/ecloc1.F
C SWAP4 - swap order of characters in the experiment version
#endif
C
-Index: emoslib-4.3.3/gribex/fortranInterface.c
+Index: emoslib-4.3.7/gribex/fortranInterface.c
===================================================================
---- emoslib-4.3.3.orig/gribex/fortranInterface.c
-+++ emoslib-4.3.3/gribex/fortranInterface.c
+--- emoslib-4.3.7.orig/gribex/fortranInterface.c
++++ emoslib-4.3.7/gribex/fortranInterface.c
@@ -179,7 +179,7 @@ void isec1l(fortint* section1, fortint*
fortint ldefnum(fortint* centre, fortint* subcentre, fortint* number) {
@@ -39,10 +39,10 @@ Index: emoslib-4.3.3/gribex/fortranInterface.c
p = value[0];
value[0] = value[6];
value[6] = p;
-Index: emoslib-4.3.3/gribex/grprs1b.F
+Index: emoslib-4.3.7/gribex/grprs1b.F
===================================================================
---- emoslib-4.3.3.orig/gribex/grprs1b.F
-+++ emoslib-4.3.3/gribex/grprs1b.F
+--- emoslib-4.3.7.orig/gribex/grprs1b.F
++++ emoslib-4.3.7/gribex/grprs1b.F
@@ -519,7 +519,7 @@ C
WRITE(GRPRSM,1105) KSEC1(44)
WRITE(HVERSION, '(A8)' ) KSEC1(45)
@@ -79,10 +79,10 @@ Index: emoslib-4.3.3/gribex/grprs1b.F
WRITE(GRPRSM,2117) HVERSION(5:5)
#else
WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-4.3.3/gribex/grprs1.F
+Index: emoslib-4.3.7/gribex/grprs1.F
===================================================================
---- emoslib-4.3.3.orig/gribex/grprs1.F
-+++ emoslib-4.3.3/gribex/grprs1.F
+--- emoslib-4.3.7.orig/gribex/grprs1.F
++++ emoslib-4.3.7/gribex/grprs1.F
@@ -949,7 +949,7 @@ C
WRITE(GRPRSM,2115) KSEC1(56)
WRITE(GRPRSM,2116) KSEC1(57)
@@ -92,10 +92,10 @@ Index: emoslib-4.3.3/gribex/grprs1.F
WRITE(GRPRSM,2117) HVERSION(5:5)
#else
WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-4.3.3/Makefile.am
+Index: emoslib-4.3.7/Makefile.am
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/Makefile.am
++++ emoslib-4.3.7/Makefile.am
@@ -0,0 +1,20 @@
+# Makefile for libemos
+#
@@ -117,10 +117,10 @@ Index: emoslib-4.3.3/Makefile.am
+ ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
+ done
+ rm -f $(LIBRARY)
-Index: emoslib-4.3.3/NEWS
+Index: emoslib-4.3.7/NEWS
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/NEWS
++++ emoslib-4.3.7/NEWS
@@ -0,0 +1,9 @@
+EMOSLIB
+
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index ef3568d..a3a4d68 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.3.3/CMakeLists.txt
+Index: emoslib-4.3.7/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/CMakeLists.txt
-+++ emoslib-4.3.3/CMakeLists.txt
-@@ -136,6 +136,13 @@ message( STATUS "BUFR_TABLES_PATH: ${BUF
+--- emoslib-4.3.7.orig/CMakeLists.txt
++++ emoslib-4.3.7/CMakeLists.txt
+@@ -142,6 +142,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.3.3/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.3.3/cmake/emos.pc.in
+Index: emoslib-4.3.7/cmake/emos.pc.in
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/cmake/emos.pc.in
++++ emoslib-4.3.7/cmake/emos.pc.in
@@ -0,0 +1,32 @@
+git_tag=@PKGCONFIG_GIT_TAG@
+
@@ -58,10 +58,10 @@ Index: emoslib-4.3.3/cmake/emos.pc.in
+Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
+Cflags: ${cflags}
+#====================================================================
-Index: emoslib-4.3.3/cmake/emosR64.pc.in
+Index: emoslib-4.3.7/cmake/emosR64.pc.in
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/cmake/emosR64.pc.in
++++ emoslib-4.3.7/cmake/emosR64.pc.in
@@ -0,0 +1,32 @@
+git_tag=@PKGCONFIG_GIT_TAG@
+
@@ -95,10 +95,10 @@ Index: emoslib-4.3.3/cmake/emosR64.pc.in
+Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
+Cflags: ${cflags}
+#====================================================================
-Index: emoslib-4.3.3/cmake/ecbuild_pkgconfig.cmake
+Index: emoslib-4.3.7/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- emoslib-4.3.3.orig/cmake/ecbuild_pkgconfig.cmake
-+++ emoslib-4.3.3/cmake/ecbuild_pkgconfig.cmake
+--- emoslib-4.3.7.orig/cmake/ecbuild_pkgconfig.cmake
++++ emoslib-4.3.7/cmake/ecbuild_pkgconfig.cmake
@@ -414,8 +414,9 @@ function( ecbuild_pkgconfig )
configure_file( ${_PAR_TEMPLATE} "${CMAKE_BINARY_DIR}/${_PAR_FILENAME}" @ONLY )
message( STATUS "pkg-config file created: ${_PAR_FILENAME}" )
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index ea81398..46d3832 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.3.3/libemos-sp-shared/CMakeLists.txt
+Index: emoslib-4.3.7/libemos-sp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/libemos-sp-shared/CMakeLists.txt
++++ emoslib-4.3.7/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.3.3/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.3.3/libemos-dp-shared/CMakeLists.txt
+Index: emoslib-4.3.7/libemos-dp-shared/CMakeLists.txt
===================================================================
--- /dev/null
-+++ emoslib-4.3.3/libemos-dp-shared/CMakeLists.txt
++++ emoslib-4.3.7/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.3.3/libemos-dp-shared/CMakeLists.txt
+ SOURCES ../libemos_version.c ${emos_dp_shared_srcs}
+ GENERATED ../libemos_version.c )
+
-Index: emoslib-4.3.3/CMakeLists.txt
+Index: emoslib-4.3.7/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/CMakeLists.txt
-+++ emoslib-4.3.3/CMakeLists.txt
-@@ -265,6 +265,8 @@ if( HAVE_SINGLE_PRECISION )
+--- emoslib-4.3.7.orig/CMakeLists.txt
++++ emoslib-4.3.7/CMakeLists.txt
+@@ -273,6 +273,8 @@ if( HAVE_SINGLE_PRECISION )
add_subdirectory( libemos-sp )
endif()
add_subdirectory( libemos-dp )
@@ -75,20 +75,31 @@ Index: emoslib-4.3.3/CMakeLists.txt
if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI" )
set_source_files_properties( version.c PROPERTIES COMPILE_DEFINITIONS "FORTRAN_LINKER_PGI" )
-Index: emoslib-4.3.3/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.3.7/cmake/ecbuild_add_library.cmake
===================================================================
---- emoslib-4.3.3.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.3.3/cmake/ecbuild_add_library.cmake
-@@ -148,7 +148,7 @@
+--- emoslib-4.3.7.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.3.7/cmake/ecbuild_add_library.cmake
+@@ -129,12 +129,18 @@
+ # OUTPUT_NAME : optional
+ # sets the OUTPUT_NAME property on the target
+ #
++# SONAME : optional
++# sets the SONAME property on the target
++#
++# SOVERSION : optional
++# sets the SOVERSION property on the target
++#
+ ##############################################################################
+
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( 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 )
+ set( multi_value_args SOURCES 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} )
-@@ -311,6 +311,15 @@ function( ecbuild_add_library_impl )
+@@ -278,6 +284,15 @@ function( ecbuild_add_library_impl )
get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
if( _target_pic )
@@ -104,7 +115,7 @@ Index: emoslib-4.3.3/cmake/ecbuild_add_library.cmake
if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
endif()
-@@ -322,6 +331,13 @@ function( ecbuild_add_library_impl )
+@@ -289,6 +304,13 @@ function( ecbuild_add_library_impl )
endif()
endif()
@@ -118,10 +129,10 @@ Index: emoslib-4.3.3/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.3.3/libemos-dp/CMakeLists.txt
+Index: emoslib-4.3.7/libemos-dp/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/libemos-dp/CMakeLists.txt
-+++ emoslib-4.3.3/libemos-dp/CMakeLists.txt
+--- emoslib-4.3.7.orig/libemos-dp/CMakeLists.txt
++++ emoslib-4.3.7/libemos-dp/CMakeLists.txt
@@ -29,6 +29,7 @@ ecbuild_add_library(
TYPE STATIC
TARGET emos
@@ -130,10 +141,10 @@ Index: emoslib-4.3.3/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.3.3/libemos-sp/CMakeLists.txt
+Index: emoslib-4.3.7/libemos-sp/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/libemos-sp/CMakeLists.txt
-+++ emoslib-4.3.3/libemos-sp/CMakeLists.txt
+--- emoslib-4.3.7.orig/libemos-sp/CMakeLists.txt
++++ emoslib-4.3.7/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 edf5ca9..c7aec06 100644
--- a/debian/patches/testbuild.patch
+++ b/debian/patches/testbuild.patch
@@ -4,11 +4,11 @@ Description: Use binaries from install location, which is where they are
Last-Updated: 2015-10-25
Forwarded: not-needed
-Index: emoslib-4.3.3/tests/CMakeLists.txt
+Index: emoslib-4.3.7/tests/CMakeLists.txt
===================================================================
---- emoslib-4.3.3.orig/tests/CMakeLists.txt
-+++ emoslib-4.3.3/tests/CMakeLists.txt
-@@ -401,7 +401,7 @@ if( HAVE_TESTS AND HAVE_LIBEMOS_BUFRDC )
+--- emoslib-4.3.7.orig/tests/CMakeLists.txt
++++ emoslib-4.3.7/tests/CMakeLists.txt
+@@ -410,7 +410,7 @@ if( HAVE_LIBEMOS_BUFRDC )
if( TEST_BUFR_TABLES_PATH_EXISTS )
ecbuild_add_test(
TARGET bufr_decode_all_NotFoundTestFile
@@ -17,7 +17,7 @@ Index: emoslib-4.3.3/tests/CMakeLists.txt
CONDITION TEST_BUFR_TABLES_PATH_EXISTS
ARGS -i NotFoundTestFile.bufr
ENVIRONMENT BUFR_TABLES=${TEST_BUFR_TABLES_PATH} )
-@@ -410,7 +410,7 @@ if( HAVE_TESTS AND HAVE_LIBEMOS_BUFRDC )
+@@ -419,7 +419,7 @@ if( HAVE_LIBEMOS_BUFRDC )
ecbuild_add_test(
TARGET bufr_decode_all_NotFoundTablesPath
@@ -26,7 +26,7 @@ Index: emoslib-4.3.3/tests/CMakeLists.txt
ARGS -i ${PROJECT_SOURCE_DIR}/data/temp_101.bufr
ENVIRONMENT BUFR_TABLES="NotFoundTablesPath/" )
set_tests_properties( bufr_decode_all_NotFoundTablesPath PROPERTIES WILL_FAIL TRUE )
-@@ -418,7 +418,7 @@ if( HAVE_TESTS AND HAVE_LIBEMOS_BUFRDC )
+@@ -427,7 +427,7 @@ if( HAVE_LIBEMOS_BUFRDC )
foreach( bufr_file ${bufr_files} )
ecbuild_add_test(
TARGET bufr_decode_all_${bufr_file}
--
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