[emos] 02/02: Refresh patches

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu Jul 16 12:45:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository emos.

commit f46d445d3efb9d913c3845f129034c014b0a429a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 16 10:00:46 2015 +0100

    Refresh patches
---
 debian/patches/bufrnum.patch       | 14 ++++++------
 debian/patches/build_fixes.patch   | 16 ++++++-------
 debian/patches/drop_tune.patch     | 10 +++++----
 debian/patches/huge.patch          | 12 +++++-----
 debian/patches/little_endian.patch | 32 +++++++++++++-------------
 debian/patches/pkgconfig.patch     | 20 ++++++++---------
 debian/patches/shared.patch        | 46 +++++++++++++++++++-------------------
 debian/patches/wvqlid2.patch       | 16 ++++++-------
 8 files changed, 84 insertions(+), 82 deletions(-)

diff --git a/debian/patches/bufrnum.patch b/debian/patches/bufrnum.patch
index 7f9cfc9..51ed693 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.0.3+dfsg.1/bufrdc_wmo/bufrnum.F
+Index: emoslib-4.0.7/bufrdc_wmo/bufrnum.F
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/bufrnum.F
++++ emoslib-4.0.7/bufrdc_wmo/bufrnum.F
 @@ -0,0 +1,122 @@
 +C 
 +C 
@@ -135,10 +135,10 @@ Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/bufrnum.F
 +C
 +      RETURN
 +      END
-Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/grprs.h
+Index: emoslib-4.0.7/bufrdc_wmo/grprs.h
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/grprs.h
++++ emoslib-4.0.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.0.3+dfsg.1/bufrdc_wmo/grprs.h
 +      INTEGER GRPRSM
 +C
 +      COMMON /GRPRSCM/ GRPRSM, GRPRSET
-Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/CMakeLists.txt
+Index: emoslib-4.0.7/bufrdc_wmo/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/bufrdc_wmo/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/CMakeLists.txt
+--- emoslib-4.0.7.orig/bufrdc_wmo/CMakeLists.txt
++++ emoslib-4.0.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 910ebaf..5b83740 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.0.3+dfsg.1/gribex/csect4.F
+Index: emoslib-4.0.7/gribex/csect4.F
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/gribex/csect4.F
-+++ emoslib-4.0.3+dfsg.1/gribex/csect4.F
+--- emoslib-4.0.7.orig/gribex/csect4.F
++++ emoslib-4.0.7/gribex/csect4.F
 @@ -304,7 +304,7 @@ C     Calculate the scale and reference
  #endif
  #if defined hpR32 || defined (__alpha) || defined hpR64 || defined hpiaR64
@@ -16,16 +16,16 @@ Index: emoslib-4.0.3+dfsg.1/gribex/csect4.F
        ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.D0,ZS)))
  #else
        ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.,ZS)))
-Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.7/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
-@@ -63,7 +63,7 @@ endif()
+--- emoslib-4.0.7.orig/CMakeLists.txt
++++ emoslib-4.0.7/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
  
  # build type flags
  if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
 -  set(CMAKE_Fortran_FLAGS         "-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -DSHAREDMEMORY")
 +  set(CMAKE_Fortran_FLAGS         "-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -DSHAREDMEMORY ${BUILD_FLAGS}")
    set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+   set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
    set(CMAKE_Fortran_FLAGS_DEBUG   "-g")
-   set(emos_special_compiler_def   "gfortran")
diff --git a/debian/patches/drop_tune.patch b/debian/patches/drop_tune.patch
index edf0f66..e98fc75 100644
--- a/debian/patches/drop_tune.patch
+++ b/debian/patches/drop_tune.patch
@@ -3,16 +3,18 @@ Description: Drop tune=native which breaks on s390x, and is a bad idea in genera
 Last-Updated: 2014-07-09
 Forwarded: no
 
-Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.7/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
-@@ -64,7 +64,7 @@ endif()
+--- emoslib-4.0.7.orig/CMakeLists.txt
++++ emoslib-4.0.7/CMakeLists.txt
+@@ -59,8 +59,8 @@ endif()
  # build type flags
  if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
    set(CMAKE_Fortran_FLAGS         "-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -DSHAREDMEMORY")
 -  set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -mtune=native")
+-  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2 -mtune=native")
 +  set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
++  set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-g -O2")
    set(CMAKE_Fortran_FLAGS_DEBUG   "-g")
    set(emos_special_compiler_def   "gfortran")
  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
diff --git a/debian/patches/huge.patch b/debian/patches/huge.patch
index b8b9df0..9c38462 100644
--- a/debian/patches/huge.patch
+++ b/debian/patches/huge.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Forwarded: no
 Last-Updated: 2015-05-13
 
-Index: emos.git/bufrdc_wmo/buens4.F
+Index: emoslib-4.0.7/bufrdc_wmo/buens4.F
 ===================================================================
---- emos.git.orig/bufrdc_wmo/buens4.F
-+++ emos.git/bufrdc_wmo/buens4.F
+--- emoslib-4.0.7.orig/bufrdc_wmo/buens4.F
++++ emoslib-4.0.7/bufrdc_wmo/buens4.F
 @@ -140,8 +140,8 @@ C               ------------------------
  C
        IF(KERR.GT.0) RETURN
@@ -18,10 +18,10 @@ Index: emos.git/bufrdc_wmo/buens4.F
  C
  C*          1.1  KEEP POINTERS TO THE BEGINING OF THE SECTION.
  C                ---------------------------------------------
-Index: emos.git/bufrdc_wmo/buexs4.F
+Index: emoslib-4.0.7/bufrdc_wmo/buexs4.F
 ===================================================================
---- emos.git.orig/bufrdc_wmo/buexs4.F
-+++ emos.git/bufrdc_wmo/buexs4.F
+--- emoslib-4.0.7.orig/bufrdc_wmo/buexs4.F
++++ emoslib-4.0.7/bufrdc_wmo/buexs4.F
 @@ -150,8 +150,8 @@ C                JNS - POINTER TO VALUES
  C
        IF(KERR.GT.0) RETURN
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
index f3dfc04..2bc647f 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-000403+dfsg.1/gribex/ecloc1.F
+Index: emoslib-4.0.7/gribex/ecloc1.F
 ===================================================================
---- emoslib-000403+dfsg.1.orig/gribex/ecloc1.F
-+++ emoslib-000403+dfsg.1/gribex/ecloc1.F
+--- emoslib-4.0.7.orig/gribex/ecloc1.F
++++ emoslib-4.0.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-000403+dfsg.1/gribex/ecloc1.F
  C     SWAP4   - swap order of characters in the experiment version
  #endif
  C
-Index: emoslib-000403+dfsg.1/gribex/fortranInterface.c
+Index: emoslib-4.0.7/gribex/fortranInterface.c
 ===================================================================
---- emoslib-000403+dfsg.1.orig/gribex/fortranInterface.c
-+++ emoslib-000403+dfsg.1/gribex/fortranInterface.c
+--- emoslib-4.0.7.orig/gribex/fortranInterface.c
++++ emoslib-4.0.7/gribex/fortranInterface.c
 @@ -180,7 +180,7 @@ void isec1l(fortint* section1, fortint*
  
  fortint ldefnum(fortint* centre, fortint* subcentre, fortint* number) {
@@ -39,10 +39,10 @@ Index: emoslib-000403+dfsg.1/gribex/fortranInterface.c
      p = value[0];
      value[0] = value[6];
      value[6] = p;
-Index: emoslib-000403+dfsg.1/gribex/grprs1b.F
+Index: emoslib-4.0.7/gribex/grprs1b.F
 ===================================================================
---- emoslib-000403+dfsg.1.orig/gribex/grprs1b.F
-+++ emoslib-000403+dfsg.1/gribex/grprs1b.F
+--- emoslib-4.0.7.orig/gribex/grprs1b.F
++++ emoslib-4.0.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-000403+dfsg.1/gribex/grprs1b.F
            WRITE(GRPRSM,2117) HVERSION(5:5)
  #else
            WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-000403+dfsg.1/gribex/grprs1.F
+Index: emoslib-4.0.7/gribex/grprs1.F
 ===================================================================
---- emoslib-000403+dfsg.1.orig/gribex/grprs1.F
-+++ emoslib-000403+dfsg.1/gribex/grprs1.F
+--- emoslib-4.0.7.orig/gribex/grprs1.F
++++ emoslib-4.0.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-000403+dfsg.1/gribex/grprs1.F
            WRITE(GRPRSM,2117) HVERSION(5:5)
  #else
            WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-000403+dfsg.1/Makefile.am
+Index: emoslib-4.0.7/Makefile.am
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/Makefile.am
++++ emoslib-4.0.7/Makefile.am
 @@ -0,0 +1,20 @@
 +# Makefile for libemos
 +#
@@ -117,10 +117,10 @@ Index: emoslib-000403+dfsg.1/Makefile.am
 +       ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
 +       done
 +	rm -f $(LIBRARY)
-Index: emoslib-000403+dfsg.1/NEWS
+Index: emoslib-4.0.7/NEWS
 ===================================================================
 --- /dev/null
-+++ emoslib-000403+dfsg.1/NEWS
++++ emoslib-4.0.7/NEWS
 @@ -0,0 +1,9 @@
 +EMOSLIB
 +
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 4876c48..f550e7a 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Last-Updated: 2015-05-13
 Forwarded: no
 
-Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.7/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
+--- emoslib-4.0.7.orig/CMakeLists.txt
++++ emoslib-4.0.7/CMakeLists.txt
 @@ -129,6 +129,13 @@ endif()
  
  ecbuild_generate_config_headers( DESTINATION ${INSTALL_INCLUDE_DIR}/libemos )
@@ -21,10 +21,10 @@ Index: emoslib-4.0.3+dfsg.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.0.3+dfsg.1/cmake/emos.pc.in
+Index: emoslib-4.0.7/cmake/emos.pc.in
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/cmake/emos.pc.in
++++ emoslib-4.0.7/cmake/emos.pc.in
 @@ -0,0 +1,32 @@
 +git_tag=@PKGCONFIG_GIT_TAG@
 +
@@ -58,10 +58,10 @@ Index: emoslib-4.0.3+dfsg.1/cmake/emos.pc.in
 +Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
 +Cflags: ${cflags}
 +#====================================================================
-Index: emoslib-4.0.3+dfsg.1/cmake/emosR64.pc.in
+Index: emoslib-4.0.7/cmake/emosR64.pc.in
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/cmake/emosR64.pc.in
++++ emoslib-4.0.7/cmake/emosR64.pc.in
 @@ -0,0 +1,32 @@
 +git_tag=@PKGCONFIG_GIT_TAG@
 +
@@ -95,10 +95,10 @@ Index: emoslib-4.0.3+dfsg.1/cmake/emosR64.pc.in
 +Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
 +Cflags: ${cflags}
 +#====================================================================
-Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_pkgconfig.cmake
+Index: emoslib-4.0.7/cmake/ecbuild_pkgconfig.cmake
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/cmake/ecbuild_pkgconfig.cmake
-+++ emoslib-4.0.3+dfsg.1/cmake/ecbuild_pkgconfig.cmake
+--- emoslib-4.0.7.orig/cmake/ecbuild_pkgconfig.cmake
++++ emoslib-4.0.7/cmake/ecbuild_pkgconfig.cmake
 @@ -358,8 +358,9 @@ function( ecbuild_pkgconfig )
    configure_file( ${_PAR_TEMPLATE} "${CMAKE_BINARY_DIR}/${_PAR_FILEPATH}" @ONLY )
    message( STATUS "pkg-config file created: ${_PAR_FILEPATH}" )
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 6d96ab1..c195926 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.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
+Index: emoslib-4.0.7/libemos-sp-shared/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
++++ emoslib-4.0.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.0.3+dfsg.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.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
+Index: emoslib-4.0.7/libemos-dp-shared/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ emoslib-4.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
++++ emoslib-4.0.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.0.3+dfsg.1/libemos-dp-shared/CMakeLists.txt
 +  SOURCES     ../libemos_version.c ${emos_dp_shared_srcs}
 +  GENERATED   ../libemos_version.c )
 +
-Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
+Index: emoslib-4.0.7/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
-@@ -242,6 +242,8 @@ if( HAVE_SINGLE_PRECISION)
+--- emoslib-4.0.7.orig/CMakeLists.txt
++++ emoslib-4.0.7/CMakeLists.txt
+@@ -238,6 +238,8 @@ if( HAVE_SINGLE_PRECISION )
    add_subdirectory( libemos-sp )
  endif()
  add_subdirectory( libemos-dp )
@@ -75,17 +75,17 @@ Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
  
  ecbuild_add_executable(
    TARGET      libemos_version
-Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
+Index: emoslib-4.0.7/cmake/ecbuild_add_library.cmake
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/cmake/ecbuild_add_library.cmake
-+++ emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
+--- emoslib-4.0.7.orig/cmake/ecbuild_add_library.cmake
++++ emoslib-4.0.7/cmake/ecbuild_add_library.cmake
 @@ -13,7 +13,7 @@
  function( ecbuild_add_library_impl )
  
  	set( options NOINSTALL AUTO_VERSION )
 -	set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
-+	set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION SONAME SOVERSION OUTPUT_NAME )
- 	set( multi_value_args  SOURCES TEMPLATES LIBS INCLUDES DEPENDS PERSISTENT DEFINITIONS CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
++	set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
+ 	set( multi_value_args  SOURCES TEMPLATES LIBS 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} )
 @@ -119,6 +119,15 @@ function( ecbuild_add_library_impl )
@@ -118,24 +118,24 @@ Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
  		# define VERSION if requested
  		if( DEFINED _PAR_VERSION )
  			set_target_properties( ${_PAR_TARGET} PROPERTIES VERSION "${_PAR_VERSION}" )
-Index: emoslib-4.0.3+dfsg.1/libemos-dp/CMakeLists.txt
+Index: emoslib-4.0.7/libemos-dp/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/libemos-dp/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/libemos-dp/CMakeLists.txt
-@@ -16,6 +16,7 @@ ecbuild_add_library(
-   TYPE STATIC
+--- emoslib-4.0.7.orig/libemos-dp/CMakeLists.txt
++++ emoslib-4.0.7/libemos-dp/CMakeLists.txt
+@@ -21,6 +21,7 @@ ecbuild_add_library(
+   TYPE        STATIC
    TARGET      emos
    OUTPUT_NAME "emosR64"
 +  SONAME      "libemosR64.so.0d"
    DEFINITIONS ${LIBEMOS_DEFINITIONS}
    SOURCES     ../libemos_version.c ${emos_dp_srcs}
    GENERATED   ../libemos_version.c )
-Index: emoslib-4.0.3+dfsg.1/libemos-sp/CMakeLists.txt
+Index: emoslib-4.0.7/libemos-sp/CMakeLists.txt
 ===================================================================
---- emoslib-4.0.3+dfsg.1.orig/libemos-sp/CMakeLists.txt
-+++ emoslib-4.0.3+dfsg.1/libemos-sp/CMakeLists.txt
-@@ -21,6 +21,7 @@ ecbuild_add_library(
-   TYPE STATIC
+--- emoslib-4.0.7.orig/libemos-sp/CMakeLists.txt
++++ emoslib-4.0.7/libemos-sp/CMakeLists.txt
+@@ -26,6 +26,7 @@ ecbuild_add_library(
+   TYPE        STATIC
    TARGET      emos_sp
    OUTPUT_NAME "emos"
 +  SONAME      "libemos.so.0d"
diff --git a/debian/patches/wvqlid2.patch b/debian/patches/wvqlid2.patch
index 1c8673a..01d518b 100644
--- a/debian/patches/wvqlid2.patch
+++ b/debian/patches/wvqlid2.patch
@@ -4,16 +4,16 @@ Author: Alastair McKInstry <mckinstry at debian.org>
 Bug-Debian: http://bugs.debian.org/571396
 Last-Updated: 2015-05-17
 
-Index: emoslib-000403+dfsg.1/interpolation/CMakeLists.txt
+Index: emoslib-4.0.7/interpolation/CMakeLists.txt
 ===================================================================
---- emoslib-000403+dfsg.1.orig/interpolation/CMakeLists.txt
-+++ emoslib-000403+dfsg.1/interpolation/CMakeLists.txt
-@@ -248,7 +248,7 @@ list( APPEND interpolation_src_files
-   wv2dxx2.F
+--- emoslib-4.0.7.orig/interpolation/CMakeLists.txt
++++ emoslib-4.0.7/interpolation/CMakeLists.txt
+@@ -251,7 +251,7 @@ list( APPEND interpolation_src_files
+   wv2dx32.F  # (unsupported entry point)
+   wv2dxxx.F
    wvqlidx.F
+-  wvqlin2.F  # unused procedure with missing symbol
++#  wvqlin2.F  # unused procedure with missing symbol
    wvqlint.F
--  wvqlin2.F # unused procedure with missing symbol
-+#  wvqlin2.F # unused procedure with missing symbol
    xrotate.F
    xyz2ll.F
-   gasetup.F

-- 
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