[metview] 01/04: Merge tag 'upstream/4.8.4' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu May 25 07:53:14 UTC 2017


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

mckinstry pushed a commit to tag debian/4.8.4-1
in repository metview.

commit 871e1f5c04716f4b517d8ded72a8d29e461a8ba2
Merge: 6d575ba 8458c1c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Mar 24 11:29:32 2017 +0000

    Merge tag 'upstream/4.8.4' into debian/master

 CMakeLists.txt                                     |   9 +
 VERSION.cmake                                      |   2 +-
 VERSION.cmake => VERSION.cmake.orig                |   8 +-
 bin/CMakeLists.txt                                 |   0
 cmake/2.8/CMakePushCheckState.cmake                |   0
 cmake/CMakeLists.txt                               |   0
 cmake/FindADSM.cmake                               |   0
 cmake/FindAEC.cmake                                |   0
 cmake/FindAIO.cmake                                |   0
 cmake/FindArmadillo.cmake                          |   0
 cmake/FindCMath.cmake                              |   0
 cmake/FindCairo.cmake                              |   0
 cmake/FindDl.cmake                                 |   0
 cmake/FindEMOS.cmake                               |   0
 cmake/FindFDB.cmake                                |   0
 cmake/FindFFTW.cmake                               |   0
 cmake/FindGeoTIFF.cmake                            |   0
 cmake/FindHPSS.cmake                               |   0
 cmake/FindLEX.cmake                                |   0
 cmake/FindLibGFortran.cmake                        |   0
 cmake/FindLibIFort.cmake                           |   0
 cmake/FindLustreAPI.cmake                          |   0
 cmake/FindMKL.cmake                                |   0
 cmake/FindNDBM.cmake                               |   0
 cmake/FindNetCDF.cmake                             |   0
 cmake/FindNetCDF3.cmake                            |   0
 cmake/FindODB.cmake                                |   0
 cmake/FindOpenCL.cmake                             |   0
 cmake/FindOpenJPEG.cmake                           |   0
 cmake/FindPGIFortran.cmake                         |   0
 cmake/FindPango.cmake                              |   0
 cmake/FindPangoCairo.cmake                         |   0
 cmake/FindProj4.cmake                              |   0
 cmake/FindREADLINE.cmake                           |   0
 cmake/FindRPCGEN.cmake                             |   0
 cmake/FindRealtime.cmake                           |   0
 cmake/FindSZip.cmake                               |   0
 cmake/FindTrilinos.cmake                           |   0
 cmake/FindViennaCL.cmake                           |   0
 cmake/FindXLFortranLibs.cmake                      |   0
 cmake/FindYACC.cmake                               |   0
 cmake/Findgrib_api.cmake                           |   0
 cmake/Findodb_api.cmake                            |   0
 cmake/Findspot.cmake                               |   0
 cmake/VERSION.cmake                                |   6 +-
 cmake/compiler_flags/Clang_C.cmake                 |   0
 cmake/compiler_flags/Clang_CXX.cmake               |   0
 cmake/compiler_flags/Cray_C.cmake                  |   0
 cmake/compiler_flags/Cray_CXX.cmake                |   0
 cmake/compiler_flags/Cray_Fortran.cmake            |   0
 cmake/compiler_flags/GNU_C.cmake                   |   0
 cmake/compiler_flags/GNU_CXX.cmake                 |   0
 cmake/compiler_flags/GNU_Fortran.cmake             |   0
 cmake/compiler_flags/Intel_C.cmake                 |   0
 cmake/compiler_flags/Intel_CXX.cmake               |   0
 cmake/compiler_flags/Intel_Fortran.cmake           |   0
 cmake/compiler_flags/PGI_C.cmake                   |   0
 cmake/compiler_flags/PGI_CXX.cmake                 |   0
 cmake/compiler_flags/PGI_Fortran.cmake             |   0
 .../CMakeCheckCompilerFlagCommonPatterns.cmake     |   0
 cmake/contrib/CheckFortranCompilerFlag.cmake       |   0
 cmake/contrib/CheckFortranSourceCompiles.cmake     |   0
 cmake/contrib/FindEigen3.cmake                     |   0
 cmake/contrib/FindNetCDF4.cmake                    |   0
 cmake/contrib/FindNumPy.cmake                      |   0
 cmake/contrib/GetGitRevisionDescription.cmake      |   0
 cmake/contrib/GetGitRevisionDescription.cmake.in   |   0
 cmake/contrib/GreatCMakeCookOff/.gitattributes     |   0
 cmake/contrib/GreatCMakeCookOff/.gitignore         |   0
 .../contrib/GreatCMakeCookOff/AddCPP11Flags.cmake  |   0
 cmake/contrib/GreatCMakeCookOff/AddGTest.cmake     |   0
 .../GreatCMakeCookOff/CheckCXX11Features.cmake     |   0
 cmake/contrib/GreatCMakeCookOff/CheckIsNaN.cmake   |   0
 cmake/contrib/GreatCMakeCookOff/FindEigen.cmake    |   0
 cmake/contrib/GreatCMakeCookOff/LICENSE            |   0
 cmake/contrib/GreatCMakeCookOff/README.md          |   0
 cmake/contrib/GreatCMakeCookOff/TestCMake.cmake    |   0
 .../GreatCMakeCookOff/cpp11/__func__-N2340.cpp     |   0
 .../contrib/GreatCMakeCookOff/cpp11/auto-N2546.cpp |   0
 .../GreatCMakeCookOff/cpp11/begin_function.cc      |   0
 .../GreatCMakeCookOff/cpp11/constexpr-N2235.cpp    |   0
 .../cpp11/constructor_delegate.cpp                 |   0
 cmake/contrib/GreatCMakeCookOff/cpp11/cstdint.cpp  |   0
 .../GreatCMakeCookOff/cpp11/decltype-N2343.cpp     |   0
 .../cpp11/deleted_constructor.cpp                  |   0
 .../cpp11/deleted_constructor_fail_compile.cpp     |   0
 .../contrib/GreatCMakeCookOff/cpp11/enable_if.cpp  |   0
 .../GreatCMakeCookOff/cpp11/explicit_cast.cpp      |   0
 .../GreatCMakeCookOff/cpp11/initialization.cpp     |   0
 .../GreatCMakeCookOff/cpp11/lambda-N2927.cpp       |   0
 .../GreatCMakeCookOff/cpp11/long_double.cpp        |   0
 .../GreatCMakeCookOff/cpp11/long_long-N1811.cpp    |   0
 cmake/contrib/GreatCMakeCookOff/cpp11/noexcept.cpp |   0
 .../GreatCMakeCookOff/cpp11/nullptr-N2431.cpp      |   0
 .../cpp11/nullptr-N2431_fail_compile.cpp           |   0
 cmake/contrib/GreatCMakeCookOff/cpp11/override.cpp |   0
 .../cpp11/override_fail_compile.cpp                |   0
 .../GreatCMakeCookOff/cpp11/random_device.cpp      |   0
 .../cpp11/rvalue_references-N2118.cpp              |   0
 .../contrib/GreatCMakeCookOff/cpp11/shared_ptr.cpp |   0
 .../cpp11/sizeof_member-N2253.cpp                  |   0
 .../cpp11/static_assert-N1720.cpp                  |   0
 .../cpp11/static_assert-N1720_fail_compile.cpp     |   0
 .../GreatCMakeCookOff/cpp11/template_alias.cpp     |   0
 .../cpp11/trivial_type_traits.cpp                  |   0
 .../GreatCMakeCookOff/cpp11/type_traits.cpp        |   0
 .../contrib/GreatCMakeCookOff/cpp11/unique_ptr.cpp |   0
 .../cpp11/variadic_templates-N2555.cpp             |   0
 .../contrib/GreatCMakeCookOff/tests/CMakeLists.txt |   0
 .../contrib/GreatCMakeCookOff/tests/addgtest.cmake |   0
 .../GreatCMakeCookOff/tests/checkcpp11flags.cmake  |   0
 .../GreatCMakeCookOff/tests/checkisnan.cmake       |   0
 .../GreatCMakeCookOff/tests/cpp11/CMakeLists.txt   |   0
 .../tests/cpp11/allfeatures.cmake                  |   0
 .../tests/cpp11/check_features.cmake               |   0
 .../tests/cpp11/parse_input_features.cmake         |   0
 cmake/ecbuild_add_c_flags.cmake                    |   0
 cmake/ecbuild_add_cxx11_flags.cmake                |   0
 cmake/ecbuild_add_cxx_flags.cmake                  |   0
 cmake/ecbuild_add_executable.cmake                 |   0
 cmake/ecbuild_add_extra_search_paths.cmake         |   0
 cmake/ecbuild_add_fortran_flags.cmake              |   0
 cmake/ecbuild_add_library.cmake                    |   0
 cmake/ecbuild_add_option.cmake                     |   0
 cmake/ecbuild_add_persistent.cmake                 |   0
 cmake/ecbuild_add_resources.cmake                  |   0
 cmake/ecbuild_add_test.cmake                       |   0
 cmake/ecbuild_append_to_rpath.cmake                |   0
 cmake/ecbuild_bundle.cmake                         |   0
 cmake/ecbuild_cache.cmake                          |   0
 cmake/ecbuild_check_c_source_return.cmake          |   0
 cmake/ecbuild_check_compiler.cmake                 |   0
 cmake/ecbuild_check_cxx11.cmake                    |   0
 cmake/ecbuild_check_cxx_source_return.cmake        |   0
 cmake/ecbuild_check_fortran.cmake                  |   0
 cmake/ecbuild_check_fortran_source_return.cmake    |   0
 cmake/ecbuild_check_functions.cmake                |   3 +
 cmake/ecbuild_check_os.cmake                       | 167 ++++-
 cmake/ecbuild_compiler_flags.cmake                 |   0
 cmake/ecbuild_config.h.in                          |   1 +
 cmake/ecbuild_declare_project.cmake                |  11 +-
 cmake/ecbuild_define_build_types.cmake             |   0
 cmake/ecbuild_define_libs_and_execs_target.cmake   |   0
 cmake/ecbuild_define_links_target.cmake            |   0
 cmake/ecbuild_define_options.cmake                 |   0
 cmake/ecbuild_define_paths.cmake                   |   0
 cmake/ecbuild_define_uninstall.cmake               |   0
 cmake/ecbuild_dont_pack.cmake                      |   0
 cmake/ecbuild_download_resource.cmake              |   0
 cmake/ecbuild_echo_targets.cmake                   |   0
 cmake/ecbuild_enable_fortran.cmake                 |   0
 cmake/ecbuild_features.cmake                       |   0
 cmake/ecbuild_find_fortranlibs.cmake               |   0
 cmake/ecbuild_find_lexyacc.cmake                   |   0
 cmake/ecbuild_find_mpi.cmake                       |   0
 cmake/ecbuild_find_omp.cmake                       |   2 +-
 cmake/ecbuild_find_package.cmake                   |   0
 cmake/ecbuild_find_perl.cmake                      |   0
 cmake/ecbuild_find_python.cmake                    |   0
 cmake/ecbuild_generate_config_headers.cmake        |   0
 cmake/ecbuild_generate_fortran_interfaces.cmake    |   0
 cmake/ecbuild_generate_rpc.cmake                   |  88 ++-
 cmake/ecbuild_generate_yy.cmake                    |   0
 cmake/ecbuild_get_cxx11_flags.cmake                |   0
 cmake/ecbuild_get_date.cmake                       |   0
 cmake/ecbuild_get_resources.cmake                  |   0
 cmake/ecbuild_get_test_data.cmake                  |   0
 cmake/ecbuild_git.cmake                            |   0
 cmake/ecbuild_install_project.cmake                |   0
 cmake/ecbuild_list_add_pattern.cmake               |   0
 cmake/ecbuild_list_exclude_pattern.cmake           |   0
 cmake/ecbuild_list_extra_search_paths.cmake        |   0
 cmake/ecbuild_list_macros.cmake                    |   0
 cmake/ecbuild_log.cmake                            |   0
 cmake/ecbuild_pkgconfig.cmake                      |   2 +-
 cmake/ecbuild_policies.cmake                       |   0
 cmake/ecbuild_print_summary.cmake                  |   0
 cmake/ecbuild_project_files.cmake                  |   0
 cmake/ecbuild_remove_fortran_flags.cmake           |   0
 cmake/ecbuild_requires_macro_version.cmake         |   0
 cmake/ecbuild_separate_sources.cmake               |   0
 cmake/ecbuild_setup_test_framework.cmake           |  19 +
 cmake/ecbuild_source_flags.cmake                   |   0
 cmake/ecbuild_system.cmake                         |   0
 cmake/ecbuild_target_flags.cmake                   |   0
 cmake/ecbuild_uninstall.cmake.in                   |   0
 cmake/ecbuild_use_package.cmake                    |   0
 cmake/ecbuild_version.h.in                         |   0
 cmake/ecbuild_warn_unused_files.cmake              |   0
 cmake/fcm-make-interfaces.cfg                      |   0
 cmake/fortran_features/CheckFortranFeatures.cmake  |   0
 cmake/fortran_features/c_size_t.F90                |   0
 cmake/fortran_features/c_sizeof.F90                |   0
 cmake/fortran_features/derivedtype_interface.F90   |   0
 cmake/fortran_features/derivedtype_io.F90          |   0
 cmake/fortran_features/finalization.F90            |   0
 cmake/fortran_features/submodules.F90              |   0
 cmake/gen_source_flags.py                          |   0
 cmake/include/ecbuild/boost_test_framework.h       |   0
 cmake/md5.in                                       |   0
 cmake/pkg-config.pc.in                             |   0
 cmake/project-config-version.cmake.in              |   0
 cmake/project-config.cmake.in                      |   0
 cmake/pymain.c                                     |   0
 cmake/sha1.in                                      |   0
 share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake     |   0
 share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake      |   0
 share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake    |   0
 share/ecbuild/toolchains/ichec-fionn-Intel.cmake   |   0
 share/metview/etc/MCONTDef.orig                    | 707 +++++++++++++++++++++
 share/metview/etc/tigge.def                        |   1 +
 src/MacroEditor/MacroEdit.cc                       |   7 +-
 src/MacroEditor/MacroEdit.ui                       |   6 -
 src/StdAppManager/NetcdfPlusDef                    |   6 +
 src/StdAppManager/NetcdfPlusRules                  |   5 +
 src/libMars/CMakeLists.txt                         |   6 +-
 .../{CMakeLists.txt => CMakeLists.txt.orig}        |  49 +-
 src/libMarsClient/CMakeLists.txt                   |  18 +-
 src/libMarsClient/base.c                           |   8 +-
 src/libMarsClient/calc.c                           |  30 -
 src/libMarsClient/fdb5base.cc                      | 205 ++++++
 src/libMarsClient/field.c                          |  26 +-
 src/libMarsClient/logfile.c                        |   2 +-
 src/libMarsClient/odb.cc                           |   3 +
 src/libMarsClient/options.c                        |   3 +
 src/libMarsClient/proto.h                          |   1 +
 src/libMetview/MvGrid.cc                           | 136 ++--
 src/libMetview/MvGrid.h                            |  92 ++-
 test/macros/plot_coast_order.mv                    |   1 +
 229 files changed, 1400 insertions(+), 230 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git



More information about the debian-science-commits mailing list