[metview] 01/14: Merge tag 'upstream/4.9.0' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Oct 25 12:49:01 UTC 2017


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

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

commit 668077d1f4da320e1cd1732ce7dff2252414efec
Merge: 3c3f606 0194dbd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 4 11:41:51 2017 +0100

    Merge tag 'upstream/4.9.0' into debian/master

 CMakeLists.txt                                     |  11 +-
 VERSION.cmake                                      |   4 +-
 bin/CMakeLists.txt                                 |   0
 bin/ecbuild                                        |  10 +-
 cmake/2.8/CMakePushCheckState.cmake                |   0
 cmake/CMakeLists.txt                               |   0
 cmake/FindADSM.cmake                               |   0
 cmake/FindAEC.cmake                                |   0
 cmake/FindAIO.cmake                                |  52 +-
 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/FindGd.cmake                                 |  59 ++
 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/FindNAG.cmake                                |  43 ++
 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                         |  25 +-
 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                 |   2 +-
 cmake/compiler_flags/Clang_CXX.cmake               |   2 +-
 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             |   2 +
 cmake/compiler_flags/Intel_C.cmake                 |   0
 cmake/compiler_flags/Intel_CXX.cmake               |   0
 cmake/compiler_flags/Intel_Fortran.cmake           |  16 +-
 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                    |   4 +-
 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  |  48 +-
 cmake/contrib/GreatCMakeCookOff/AddGTest.cmake     |   0
 .../GreatCMakeCookOff/CheckCXX11Features.cmake     |   4 +-
 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                 |  35 +-
 cmake/ecbuild_add_extra_search_paths.cmake         |   0
 cmake/ecbuild_add_fortran_flags.cmake              |   0
 cmake/ecbuild_add_library.cmake                    |  89 ++-
 cmake/ecbuild_add_option.cmake                     |   0
 cmake/ecbuild_add_persistent.cmake                 |   4 +-
 cmake/ecbuild_add_resources.cmake                  |   7 +
 cmake/ecbuild_add_test.cmake                       |  69 +-
 cmake/ecbuild_append_to_rpath.cmake                |  15 +-
 cmake/ecbuild_bundle.cmake                         |  10 +-
 cmake/ecbuild_cache.cmake                          |   0
 cmake/ecbuild_check_c_source_return.cmake          |  14 +-
 cmake/ecbuild_check_compiler.cmake                 |   4 +
 cmake/ecbuild_check_cxx11.cmake                    |   2 +-
 cmake/ecbuild_check_cxx_source_return.cmake        |  10 +-
 cmake/ecbuild_check_fortran.cmake                  |   0
 cmake/ecbuild_check_fortran_source_return.cmake    |   6 +-
 cmake/ecbuild_check_functions.cmake                |   2 +
 cmake/ecbuild_check_os.cmake                       |   7 +
 cmake/ecbuild_compiler_flags.cmake                 |  16 +-
 cmake/ecbuild_config.h.in                          |   2 +
 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                 |   6 +
 cmake/ecbuild_define_paths.cmake                   |  19 +-
 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               |   4 +-
 cmake/ecbuild_find_lexyacc.cmake                   |   0
 cmake/ecbuild_find_mpi.cmake                       |   0
 cmake/ecbuild_find_omp.cmake                       |   4 +-
 cmake/ecbuild_find_package.cmake                   |  10 +-
 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                   |   0
 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                  |   9 +-
 cmake/ecbuild_git.cmake                            |   6 +-
 cmake/ecbuild_install_project.cmake                |   2 +
 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                            |   2 +-
 cmake/ecbuild_pkgconfig.cmake                      |   0
 cmake/ecbuild_policies.cmake                       |  10 +-
 cmake/ecbuild_print_summary.cmake                  |   0
 cmake/ecbuild_project_files.cmake                  |   0
 cmake/ecbuild_remove_fortran_flags.cmake           |   6 +-
 cmake/ecbuild_requires_macro_version.cmake         |   0
 cmake/ecbuild_separate_sources.cmake               |   0
 cmake/ecbuild_setup_test_framework.cmake           |  18 +-
 cmake/ecbuild_source_flags.cmake                   |   0
 cmake/ecbuild_system.cmake                         |  16 +-
 cmake/ecbuild_target_flags.cmake                   |   0
 cmake/ecbuild_try_run.cmake                        | 200 ++++++
 cmake/ecbuild_uninstall.cmake.in                   |  15 +-
 cmake/ecbuild_use_package.cmake                    |  58 +-
 cmake/ecbuild_version.h.in                         |   0
 cmake/ecbuild_warn_unused_files.cmake              |   0
 cmake/fcm-make-interfaces.cfg                      |   0
 cmake/fortran_features/CheckFortranFeatures.cmake  |   4 +-
 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                      |   2 +-
 cmake/pymain.c                                     |   0
 cmake/sg.pl                                        |   5 +-
 cmake/sha1.in                                      |   0
 scripts/CMakeLists.txt                             |  27 +-
 scripts/set_mars_env                               |   6 +-
 share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake     | 105 ++-
 share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake      |  93 +++
 share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake    |  93 +++
 share/ecbuild/toolchains/ichec-fionn-Intel.cmake   |   0
 share/metview/app-defaults/Desktop.qss             |   2 +
 share/metview/app-defaults/metview.qss             |   2 +
 share/metview/etc/MTEXTDef                         |   7 +
 share/metview/etc/MarsRules                        |   5 +-
 share/metview/etc/ecmwf.def                        |   1 +
 share/metview/etc/mars.chk                         |   5 +-
 share/metview/etc/reportypes.def                   |  10 +
 share/metview/etc/rt_by_obsgroup.chk               |  12 +-
 share/metview/etc/tigge.def                        |   3 +
 src/AppMod/MvMailTo.cc                             |   4 +-
 src/AppMod/savepool.cc                             |   2 +-
 src/Desktop/IconFactory.cc                         |   2 +-
 src/Hovmoeller/MHovmoellerViewDef                  |   7 +
 src/Hovmoeller/MHovmoellerViewRules                |   4 +
 src/Macro/compute.cc                               |   2 +-
 src/Macro/grib.cc                                  |   6 +-
 src/Macro/include/value.h                          |   4 +-
 src/Macro/main.cc                                  |   6 +-
 src/Macro/mvector.cc                               | 174 +++++
 src/Macro/mvimport.c                               |  10 +-
 src/Macro/mvimportDesktop.c                        |  10 +-
 src/Macro/request.cc                               |   6 +-
 src/MetviewUI/FolderWindow.cc                      |   2 +-
 src/MetviewUI/IconFactory.cc                       |   2 +-
 src/Scm/ScmRun.cc                                  |   2 +-
 src/Stations/stat.fmt                              | 743 +++++++++++----------
 src/XSection/CrossS.cc                             |  13 +-
 src/XSection/MvXsectFrame.cc                       |  30 +-
 src/XSection/MvXsectFrame.h                        |  22 +-
 src/XSection/Xsect.cc                              |  24 +
 src/libMars/CMakeLists.txt                         |   6 +-
 src/libMarsClient/CMakeLists.txt                   |   1 +
 src/libMarsClient/base.c                           |  10 +-
 src/libMarsClient/filebase.c                       |   2 +-
 src/libMarsClient/globals.h                        |   2 +-
 src/libMarsClient/langl.l                          |   2 +-
 src/libMarsClient/mars.h                           |   5 +-
 src/libMarsClient/memory.c                         |  36 +-
 src/libMarsClient/options.c                        |   2 +-
 src/libMarsClient/proto.h                          |  19 +-
 src/libMarsClient/tools.c                          |   2 +-
 src/libMetview/MvRequest.cc                        |   2 +-
 src/libMetview/Path.cc                             |   4 +-
 src/libMvQtGui/MvQStationsWidget.cc                |   4 +-
 src/libUtil/MvPath.cc                              |   4 +-
 src/uPlot/DataBuilder.cc                           |   2 +-
 src/uPlot/ExportDialog.cc                          |   2 +-
 src/uPlot/HovmoellerView.cc                        |  60 +-
 src/uPlot/ObjectInfo.cc                            |   8 +-
 src/uPlot/ObjectList.cc                            |   2 +-
 src/uPlot/PlotPageBuilder.cc                       |   2 +-
 src/uPlot/uPlot.cc                                 |  20 +-
 test/macros/vectors.mv                             |  96 ++-
 268 files changed, 1948 insertions(+), 778 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