[metview] 05/20: Merge tag 'upstream/4.6.7' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Oct 29 13:50:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.7.2-1
in repository metview.
commit 90319580688a33155d9c3bc402b706d0cb48b970
Merge: cf8dda4 b0a79a8
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jul 8 03:31:23 2016 +0100
Merge tag 'upstream/4.6.7' into debian/master
CMakeLists.txt | 192 +++++++++--------
VERSION.cmake | 2 +-
VERSION.cmake.orig | 9 -
bin/CMakeLists.txt | 4 +-
bin/ecbuild | 60 +++---
cmake/CheckFortranSourceCompiles.cmake | 8 +-
cmake/FindADSM.cmake | 2 +-
cmake/FindAEC.cmake | 2 +-
cmake/FindAIO.cmake | 2 +-
cmake/FindArmadillo.cmake | 7 +-
cmake/FindCMath.cmake | 15 +-
cmake/FindCairo.cmake | 5 +-
cmake/FindDl.cmake | 7 +-
cmake/FindEMOS.cmake | 2 +-
cmake/FindFDB.cmake | 2 +-
cmake/FindGeoTIFF.cmake | 5 +-
cmake/FindHPSS.cmake | 2 +-
cmake/FindLEX.cmake | 2 +-
cmake/FindLegacyFDB.cmake | 35 ---
cmake/FindLibGFortran.cmake | 9 +-
cmake/FindLibIFort.cmake | 7 +-
cmake/FindMKL.cmake | 2 +-
cmake/FindNDBM.cmake | 2 +-
cmake/FindNetCDF.cmake | 2 +-
cmake/FindNetCDF3.cmake | 7 +-
cmake/FindODB.cmake | 2 +-
cmake/FindOpenCL.cmake | 7 +-
cmake/FindOpenJPEG.cmake | 2 +-
cmake/FindPGIFortran.cmake | 11 +-
cmake/FindPango.cmake | 8 +-
cmake/FindPangoCairo.cmake | 20 +-
cmake/FindProj4.cmake | 2 +-
cmake/FindREADLINE.cmake | 2 +-
cmake/FindRPCGEN.cmake | 2 +-
cmake/FindRealtime.cmake | 8 +-
cmake/FindSZip.cmake | 2 +-
cmake/FindTrilinos.cmake | 2 +-
cmake/FindViennaCL.cmake | 7 +-
cmake/FindXLFortranLibs.cmake | 8 +-
cmake/FindYACC.cmake | 2 +-
cmake/Findgrib_api.cmake | 2 +-
cmake/Findodb_api.cmake | 2 +-
cmake/Findspot.cmake | 2 +-
cmake/VERSION.cmake | 4 +-
cmake/compiler_flags/PGI_C.cmake | 2 +-
cmake/compiler_flags/PGI_CXX.cmake | 2 +-
cmake/compiler_flags/PGI_Fortran.cmake | 2 +-
cmake/contrib/FindFFTW.cmake | 193 +++++++++++------
cmake/contrib/FindNetCDF4.cmake | 29 ++-
cmake/ecbuild_add_c_flags.cmake | 14 +-
cmake/ecbuild_add_cxx11_flags.cmake | 2 +-
cmake/ecbuild_add_cxx_flags.cmake | 14 +-
cmake/ecbuild_add_executable.cmake | 8 +-
cmake/ecbuild_add_extra_search_paths.cmake | 2 +-
cmake/ecbuild_add_fortran_flags.cmake | 14 +-
cmake/ecbuild_add_library.cmake | 12 +-
cmake/ecbuild_add_option.cmake | 39 ++--
cmake/ecbuild_add_persistent.cmake | 8 +-
cmake/ecbuild_add_resources.cmake | 6 +-
cmake/ecbuild_add_test.cmake | 52 +++--
cmake/ecbuild_append_to_rpath.cmake | 4 +-
cmake/ecbuild_bundle.cmake | 8 +-
cmake/ecbuild_cache.cmake | 2 +-
cmake/ecbuild_check_c_source_return.cmake | 12 +-
cmake/ecbuild_check_compiler.cmake | 2 +-
cmake/ecbuild_check_cxx11.cmake | 17 +-
cmake/ecbuild_check_cxx_source_return.cmake | 16 +-
cmake/ecbuild_check_fortran_source_return.cmake | 14 +-
cmake/ecbuild_check_functions.cmake | 4 +-
cmake/ecbuild_check_os.cmake | 102 +++++----
cmake/ecbuild_config.h.in | 4 +-
cmake/ecbuild_declare_project.cmake | 12 +-
cmake/ecbuild_define_build_types.cmake | 4 +-
cmake/ecbuild_define_libs_and_execs_target.cmake | 2 +-
cmake/ecbuild_define_links_target.cmake | 2 +-
cmake/ecbuild_define_options.cmake | 2 +-
cmake/ecbuild_define_paths.cmake | 2 +-
cmake/ecbuild_dont_pack.cmake | 6 +-
cmake/ecbuild_download_resource.cmake | 6 +-
cmake/ecbuild_echo_targets.cmake | 18 +-
cmake/ecbuild_enable_fortran.cmake | 6 +-
cmake/ecbuild_features.cmake | 4 +-
cmake/ecbuild_find_fortranlibs.cmake | 14 +-
cmake/ecbuild_find_lexyacc.cmake | 7 +-
cmake/ecbuild_find_mpi.cmake | 14 +-
cmake/ecbuild_find_omp.cmake | 4 +-
cmake/ecbuild_find_package.cmake | 30 +--
cmake/ecbuild_find_perl.cmake | 6 +-
cmake/ecbuild_find_python.cmake | 10 +-
cmake/ecbuild_generate_config_headers.cmake | 4 +-
cmake/ecbuild_generate_fortran_interfaces.cmake | 54 +++--
cmake/ecbuild_generate_rpc.cmake | 10 +-
cmake/ecbuild_generate_yy.cmake | 12 +-
cmake/ecbuild_get_cxx11_flags.cmake | 4 +-
cmake/ecbuild_get_date.cmake | 6 +-
cmake/ecbuild_get_resources.cmake | 6 +-
cmake/ecbuild_get_test_data.cmake | 20 +-
cmake/ecbuild_git.cmake | 51 ++---
cmake/ecbuild_install_project.cmake | 8 +-
cmake/ecbuild_list_add_pattern.cmake | 2 +-
cmake/ecbuild_list_exclude_pattern.cmake | 8 +-
cmake/ecbuild_list_extra_search_paths.cmake | 2 +-
cmake/ecbuild_list_macros.cmake | 2 +-
cmake/ecbuild_log.cmake | 131 ++++++++----
cmake/ecbuild_pkgconfig.cmake | 6 +-
cmake/ecbuild_policies.cmake | 2 +-
cmake/ecbuild_print_summary.cmake | 60 +++---
cmake/ecbuild_project_files.cmake | 4 +-
cmake/ecbuild_requires_macro_version.cmake | 4 +-
cmake/ecbuild_separate_sources.cmake | 8 +-
cmake/ecbuild_setup_test_framework.cmake | 6 +-
cmake/ecbuild_source_flags.cmake | 2 +-
cmake/ecbuild_system.cmake | 22 +-
cmake/ecbuild_use_package.cmake | 16 +-
cmake/ecbuild_version.h.in | 2 +-
cmake/ecbuild_warn_unused_files.cmake | 28 +--
cmake/fcm-make-interfaces.cfg | 31 +++
cmake/gen_source_flags.py | 2 +-
cmake/include/ecbuild/boost_test_framework.h | 2 +-
cmake/sg.pl | 2 +-
project_summary.cmake | 46 ++--
scripts/CMakeLists.txt | 32 ++-
scripts/CMakeLists.txt.orig | 260 -----------------------
scripts/metview_base.in | 25 ++-
scripts/mv_flextra_prep | 2 +-
scripts/mv_flextra_run | 9 +
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 11 +
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 11 +
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 25 ++-
share/metview/app-defaults/CMakeLists.txt | 2 +-
share/metview/etc/CMakeLists.txt | 10 +-
share/metview/etc/ObjectList | 4 +-
share/metview/etc/ecmwf.def | 22 +-
share/metview/etc/tigge.def | 26 +++
share/metview/icons_mv5/FLEXTRA_FILE.svg | 75 ++++---
share/metview/icons_mv5/FLEXTRA_PREPARE.svg | 63 ++++--
share/metview/icons_mv5/FLEXTRA_RUN.svg | 257 ++++++++++++++--------
share/metview/icons_mv5/FLEXTRA_VISUALISER.svg | 215 +++++++++++++------
src/Desktop/MvQIconProvider.cc | 72 +++++--
src/Desktop/MvQIconProvider.h | 10 +-
src/Desktop/Parameter.cc | 13 ++
src/Flextra/FlextraRun.cc | 20 +-
src/Flextra/ObjectSpec.Flexpart | 2 +-
src/Macro/misc.cc | 11 +
src/OdbExaminer/OdbExaminer.cc | 9 +-
src/OgcClient/MvQWmsClient.cc | 2 +-
src/libMars/CMakeLists.txt | 2 +-
src/libMarsClient/CMakeLists.txt | 17 +-
src/libMarsClient/dhsbase.c | 188 +++++++++++-----
src/libMarsClient/environ.c | 2 +-
src/libMarsClient/nfdbbase.c | 44 ++--
src/libMarsClient/request.c | 29 ++-
src/libMarsClient/rpcmars.x | 4 +-
src/libMarsClient/tools.c | 12 +-
src/libMetview/MvGrid.cc | 7 +-
src/libMetview/MvGrid.h | 1 +
src/libMetview/MvObsSet.cc | 134 ++++++------
src/libMetview/MvRequest.cc | 4 +-
src/libMetview/MvScanFileType.cc | 21 +-
src/libMvQtGui/MvQAbout.cc | 8 +
src/libMvQtGui/MvQAbout.h | 3 +-
src/libUtil/CMakeLists.txt.orig | 73 -------
src/libUtil/MvFlextra.cc | 2 +-
src/uPlot/CMakeLists.txt | 2 +-
src/uPlot/MagPlusBatchService.cc | 12 +-
src/uPlot/MagicsTranslator.cc | 6 +
src/uPlot/MvMain.cc | 6 +-
src/uPlot/uPlotBase.cc | 13 +-
test/data/odb_test_set.odb | Bin 0 -> 13297 bytes
test/macros/CMakeLists.txt | 5 +
test/macros/odb_read.mv | 53 +++++
test/macros/plot_coast_order.mv | 1 -
172 files changed, 2085 insertions(+), 1535 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