[metview] 03/15: Merge tag 'upstream/4.6.5' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Mon Jun 20 07:51:50 UTC 2016


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

mckinstry pushed a commit to tag debian/4.6.5-3
in repository metview.

commit c557a7bdca0d4c5401993d54fc918102ccea37ba
Merge: 5561f85 217eef2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Mar 18 14:09:08 2016 +0000

    Merge tag 'upstream/4.6.5' into debian/master

 CMakeLists.txt                                     |  15 +-
 INSTALL                                            |   2 +-
 VERSION.cmake                                      |   2 +-
 VERSION.cmake => VERSION.cmake.orig                |   6 +-
 bin/ecbuild                                        |  32 +-
 cmake/FindLibGFortran.cmake                        |  14 +-
 cmake/FindNetCDF.cmake                             |  44 +-
 cmake/FindPango.cmake                              |  14 +-
 cmake/FindPangoCairo.cmake                         |  12 +-
 cmake/FindProj4.cmake                              |  10 +-
 cmake/FindREADLINE.cmake                           |   4 +-
 cmake/Findgrib_api.cmake                           |  42 +-
 cmake/VERSION.cmake                                |   6 +-
 cmake/compiler_flags/Clang_C.cmake                 |  13 +
 cmake/compiler_flags/Clang_CXX.cmake               |  13 +
 cmake/compiler_flags/Cray_C.cmake                  |  14 +
 cmake/compiler_flags/Cray_CXX.cmake                |  14 +
 cmake/compiler_flags/Cray_Fortran.cmake            |  15 +
 cmake/compiler_flags/GNU_C.cmake                   |  18 +
 cmake/compiler_flags/GNU_CXX.cmake                 |  18 +
 cmake/compiler_flags/GNU_Fortran.cmake             |  21 +
 cmake/compiler_flags/Intel_C.cmake                 |  13 +
 cmake/compiler_flags/Intel_CXX.cmake               |  13 +
 cmake/compiler_flags/Intel_Fortran.cmake           |  14 +
 cmake/compiler_flags/PGI_C.cmake                   |  11 +
 cmake/compiler_flags/PGI_CXX.cmake                 |  11 +
 cmake/compiler_flags/PGI_Fortran.cmake             |  11 +
 cmake/contrib/FindNetCDF4.cmake                    |  14 +-
 cmake/contrib/GetGitRevisionDescription.cmake.in   |   6 +-
 cmake/ecbuild_add_c_flags.cmake                    |  58 +-
 cmake/ecbuild_add_cxx_flags.cmake                  |  58 +-
 cmake/ecbuild_add_executable.cmake                 | 162 +++-
 cmake/ecbuild_add_extra_search_paths.cmake         |  10 +-
 cmake/ecbuild_add_fortran_flags.cmake              |  60 +-
 cmake/ecbuild_add_library.cmake                    | 143 +++-
 cmake/ecbuild_add_option.cmake                     |  37 +-
 cmake/ecbuild_add_persistent.cmake                 |  12 +-
 cmake/ecbuild_add_test.cmake                       |  29 +-
 cmake/ecbuild_bundle.cmake                         |  36 +-
 cmake/ecbuild_check_compiler.cmake                 |   7 +-
 cmake/ecbuild_check_cxx_source_return.cmake        |  40 +-
 cmake/ecbuild_check_functions.cmake                |  14 +-
 cmake/ecbuild_check_os.cmake                       |  43 +-
 cmake/ecbuild_compiler_flags.cmake                 |  97 +++
 cmake/ecbuild_debug_var.cmake                      |  47 --
 cmake/ecbuild_declare_project.cmake                |  22 +-
 cmake/ecbuild_define_build_types.cmake             |  78 --
 cmake/ecbuild_define_libs_and_execs_target.cmake   |  29 +
 ...get.cmake => ecbuild_define_links_target.cmake} |   8 +-
 cmake/ecbuild_define_options.cmake                 |  10 +-
 cmake/ecbuild_echo_targets.cmake                   |   6 +-
 cmake/ecbuild_enable_fortran.cmake                 |   9 +-
 cmake/ecbuild_features.cmake                       |  51 +-
 cmake/ecbuild_find_lexyacc.cmake                   |  18 +-
 cmake/ecbuild_find_omp.cmake                       |   7 +
 cmake/ecbuild_find_package.cmake                   |   6 +-
 cmake/ecbuild_find_python.cmake                    | 132 ++--
 cmake/ecbuild_generate_fortran_interfaces.cmake    | 115 +++
 cmake/ecbuild_generate_yy.cmake                    |  28 +-
 cmake/ecbuild_get_resources.cmake                  |  14 +-
 cmake/ecbuild_get_test_data.cmake                  |  24 +-
 cmake/ecbuild_git.cmake                            |   8 +-
 cmake/ecbuild_install_project.cmake                |  79 +-
 cmake/ecbuild_list_add_pattern.cmake               | 102 +++
 cmake/ecbuild_list_exclude_pattern.cmake           |  88 +++
 cmake/ecbuild_list_extra_search_paths.cmake        |  10 +-
 cmake/ecbuild_list_macros.cmake                    |  38 +-
 cmake/ecbuild_log.cmake                            |  90 ++-
 cmake/ecbuild_policies.cmake                       |   8 +-
 cmake/ecbuild_print_summary.cmake                  |   6 +-
 cmake/ecbuild_project_files.cmake                  |   8 +-
 cmake/ecbuild_remove_fortran_flags.cmake           |  61 ++
 cmake/ecbuild_separate_sources.cmake               |   8 +-
 cmake/ecbuild_setup_test_framework.cmake           |   6 +-
 cmake/ecbuild_source_flags.cmake                   |  30 +
 cmake/ecbuild_system.cmake                         |  62 +-
 cmake/ecbuild_use_package.cmake                    |  23 +-
 cmake/gen_source_flags.py                          |  84 ++
 cmake/project-config.cmake.in                      |  49 +-
 scripts/CMakeLists.txt                             |  38 +-
 scripts/{CMakeLists.txt => CMakeLists.txt.orig}    |  98 ++-
 scripts/MarsOdbWrapper                             |   2 +-
 scripts/MarsTiggeWrapper                           |   2 +-
 scripts/ObstatToolWrapper                          |   2 +-
 scripts/compile.in                                 |  31 +-
 scripts/compile.src                                |   2 +-
 scripts/dump                                       |   2 +-
 scripts/find_from_libs                             |   2 +-
 scripts/generate_video                             |   4 +-
 scripts/logrun                                     |   2 +-
 scripts/metgram.py                                 | 134 ++++
 scripts/metview-mail                               |   2 +-
 scripts/metview_base.in                            |  47 +-
 scripts/metview_create_user_dir                    |   7 +-
 scripts/metview_help                               |   4 +
 scripts/mv_compress                                |   2 +-
 scripts/mv_dots                                    |   2 +-
 scripts/mv_flexpart_run                            |   2 +-
 scripts/mv_flextra_prep                            |   2 +-
 scripts/mv_flextra_run                             |   4 +-
 scripts/mv_grib_dump                               |   2 +-
 scripts/mv_mail                                    |   2 +-
 scripts/mv_obstat                                  |   2 +-
 scripts/mv_odbsql                                  |   2 +-
 scripts/mv_rttov_run                               |   2 +-
 scripts/mv_scm_run                                 |   2 +-
 scripts/mv_uniquename                              |   4 +-
 scripts/mv_vapor_gui                               |   2 +-
 scripts/mvrun                                      |   2 +-
 scripts/mvrun_c                                    |   2 +-
 scripts/mvrun_lnx                                  |   2 +-
 scripts/mvusage                                    |   2 +-
 scripts/select_mars_config                         |   2 +-
 scripts/set_mars_env                               |   2 +-
 share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake     |  56 +-
 share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake      |  50 +-
 share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake    |  44 +-
 .../app-defaults/LayerKeyProfile_default.xml       |   3 +-
 share/metview/app-defaults/Sample_Drawers.tar.gz   | Bin 2133 -> 5016 bytes
 share/metview/app-defaults/User_Dir_Frame.tar.gz   | Bin 403101 -> 448836 bytes
 share/metview/etc/MagicsColors.h                   |   1 +
 share/metview/etc/MarsRules                        |   8 +-
 share/metview/etc/ObsFilterDef                     |   7 +-
 share/metview/etc/PageFrameDef                     |   2 +-
 share/metview/etc/ecmwf.def                        |  12 +-
 share/metview/etc/mars.chk                         |   8 +-
 share/metview/etc/tigge.def                        |   2 +
 share/metview/icons/fix_last_line                  |   2 +-
 src/AppMod/checkdisplay.cc                         |   4 +-
 src/Hovmoeller/HovArea.cc                          |  21 +-
 src/Hovmoeller/HovHeight.cc                        |  16 +
 src/Hovmoeller/HovLine.cc                          |  17 +
 src/Hovmoeller/HovToolkit.cc                       | 100 +--
 src/Hovmoeller/HovToolkit.h                        |   3 +
 src/Macro/extern.cc                                |   7 +-
 src/MacroEditor/ShellHelper.cc                     |   2 +-
 src/Meteogram/CMakeLists.txt                       |  10 -
 src/Meteogram/MetPlus.cc                           |  42 +-
 src/Meteogram/MetPlusDef                           |  12 +-
 src/Meteogram/ObjectSpec.Meteogram                 |   2 +-
 src/Stations/CMakeLists.txt                        |   3 +-
 src/Stations/stat.fmt                              | 877 +++++++++++----------
 src/Thermo/BufrThermo.cc                           | 107 ++-
 src/Thermo/GribThermo.cc                           |  58 +-
 src/Thermo/Thermo.cc                               |  26 +
 src/Thermo/Thermo.h                                |   4 +
 src/Thermo/ThermoDataDef                           |   1 +
 src/XSection/Average.cc                            |  38 +-
 src/XSection/CrossS.cc                             |  27 +-
 src/XSection/MVProfileDef                          |   8 +-
 src/XSection/MVProfileRules                        |   6 +-
 src/XSection/MVProfileViewDef                      |   8 +-
 src/XSection/MVProfileViewRules                    |   4 +-
 src/XSection/MXAverageViewDef                      |   4 +-
 src/XSection/VertProfDef                           |   8 +-
 src/XSection/VertProfRules                         |   4 +-
 src/XSection/VertProfViewDef                       |   8 +-
 src/XSection/VertProfViewRules                     |   4 +-
 src/XSection/Vprofile.cc                           |  41 +-
 src/XSection/Xsect.cc                              |  24 +-
 src/XSection/Xsect.h                               |   4 +
 src/libFTimeUtil/CMakeLists.txt                    |   1 +
 src/libMetview/CMakeLists.txt                      |   1 +
 src/libMetview/MvRequest.cc                        | 128 ++-
 src/libMetview/MvRequest.h                         |   4 +-
 src/libMvMotif/CMakeLists.txt                      |   1 +
 src/libMvNetCDF/CMakeLists.txt                     |   1 +
 src/libMvQtGui/CMakeLists.txt                      |   1 +
 src/libMvQtUtil/CMakeLists.txt                     |   1 +
 src/libUtil/CMakeLists.txt                         |   1 +
 .../{CMakeLists.txt => CMakeLists.txt.orig}        |   5 +
 src/libUtil/MvMiscelaneous.cc                      |   8 +-
 src/libUtil/MvPath.cc                              |  54 +-
 src/libUtil/MvPath.hpp                             |   2 +-
 src/uPlot/AverageView.cc                           |  27 +-
 src/uPlot/AverageView.h                            |   3 +
 src/uPlot/CommonXSectView.cc                       |  62 +-
 src/uPlot/CommonXSectView.h                        |   5 +-
 src/uPlot/HovmoellerView.cc                        | 404 +++++-----
 src/uPlot/HovmoellerView.h                         |  21 +-
 src/uPlot/MacroConverter.cc                        |  92 ++-
 src/uPlot/MapView.cc                               |  16 +-
 src/uPlot/MatchingCriteria.cc                      |  34 +-
 src/uPlot/MatchingCriteria.h                       |  10 +-
 src/uPlot/MvGribDecoder.cc                         |  56 +-
 src/uPlot/MvMain.cc                                | 230 ++++--
 src/uPlot/MvQLayerContentsIcon.cc                  |   2 +-
 src/uPlot/ObjectInfo.cc                            | 122 ++-
 src/uPlot/ObjectList.cc                            |  50 +-
 src/uPlot/ObjectList.h                             |   2 +-
 src/uPlot/Presentable.cc                           |  45 +-
 src/uPlot/ThermoView.cc                            |  59 +-
 src/uPlot/VertProfView.cc                          |  70 +-
 src/uPlot/VertProfView.h                           |   3 +
 src/uPlot/XSectView.cc                             |  21 +-
 src/uPlot/XSectView.h                              |   4 +
 196 files changed, 4052 insertions(+), 2202 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