[metview] 05/13: Merge tag 'upstream/4.6.1' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Feb 11 19:24:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.6.1-1
in repository metview.
commit 144a93b2c713ccd7bcc628baffe738fdd3185a23
Merge: 154ef20 b8dbd30
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jan 4 03:49:26 2016 +0000
Merge tag 'upstream/4.6.1' into debian/master
CMakeLists.txt | 187 ++-----
VERSION.cmake | 4 +-
bin/CMakeLists.txt | 3 +
bin/ecbuild | 424 ++++++++++++++++
cmake/FindADSM.cmake | 2 +-
cmake/FindAEC.cmake | 2 +-
cmake/FindAIO.cmake | 2 +-
cmake/FindArmadillo.cmake | 2 +-
cmake/FindCMath.cmake | 2 +-
cmake/FindDl.cmake | 2 +-
cmake/FindEMOS.cmake | 2 +-
cmake/FindFDB.cmake | 2 +-
cmake/FindHPSS.cmake | 2 +-
cmake/FindLEX.cmake | 2 +-
cmake/FindLegacyFDB.cmake | 2 +-
cmake/FindLibGFortran.cmake | 2 +-
cmake/FindNDBM.cmake | 2 +-
cmake/FindNetCDF.cmake | 2 +-
cmake/FindNetCDF3.cmake | 2 +-
cmake/FindODB.cmake | 2 +-
cmake/FindOpenJPEG.cmake | 2 +-
cmake/FindPGIFortran.cmake | 2 +-
cmake/FindPango.cmake | 2 +-
cmake/FindPangoCairo.cmake | 2 +-
cmake/FindREADLINE.cmake | 2 +-
cmake/FindRPCGEN.cmake | 2 +-
cmake/FindRealtime.cmake | 2 +-
cmake/FindSZip.cmake | 2 +-
cmake/FindTrilinos.cmake | 2 +-
cmake/FindXLFortranLibs.cmake | 2 +-
cmake/FindYACC.cmake | 2 +-
cmake/Findgrib_api.cmake | 2 +-
cmake/Findodb_api.cmake | 2 +-
cmake/Findspot.cmake | 2 +-
cmake/contrib/FindNetCDF4.cmake | 26 +-
cmake/ecbuild_add_c_flags.cmake | 80 +++
cmake/ecbuild_add_cxx11_flags.cmake | 2 +-
cmake/ecbuild_add_cxx_flags.cmake | 80 +++
cmake/ecbuild_add_executable.cmake | 5 +-
cmake/ecbuild_add_extra_search_paths.cmake | 2 +-
cmake/ecbuild_add_fortran_flags.cmake | 86 ++++
cmake/ecbuild_add_library.cmake | 55 ++-
cmake/ecbuild_add_option.cmake | 22 +-
cmake/ecbuild_add_persistent.cmake | 2 +-
cmake/ecbuild_add_resources.cmake | 2 +-
cmake/ecbuild_add_test.cmake | 5 +-
cmake/ecbuild_append_to_rpath.cmake | 2 +-
cmake/ecbuild_cache.cmake | 2 +-
...e.cmake => ecbuild_check_c_source_return.cmake} | 74 +--
cmake/ecbuild_check_compiler.cmake | 2 +-
cmake/ecbuild_check_cxx11.cmake | 2 +-
...cmake => ecbuild_check_cxx_source_return.cmake} | 60 +--
...e => ecbuild_check_fortran_source_return.cmake} | 66 +--
cmake/ecbuild_check_functions.cmake | 2 +-
cmake/ecbuild_check_os.cmake | 33 +-
cmake/ecbuild_config.h.in | 2 +-
cmake/ecbuild_debug_var.cmake | 2 +-
cmake/ecbuild_declare_project.cmake | 40 +-
cmake/ecbuild_define_build_types.cmake | 2 +-
cmake/ecbuild_define_options.cmake | 6 +-
cmake/ecbuild_define_paths.cmake | 2 +-
cmake/ecbuild_enable_fortran.cmake | 2 +-
cmake/ecbuild_find_lexyacc.cmake | 2 +-
cmake/ecbuild_find_mpi.cmake | 10 +-
cmake/ecbuild_find_omp.cmake | 2 +-
cmake/ecbuild_find_package.cmake | 83 ++--
cmake/ecbuild_find_perl.cmake | 2 +-
cmake/ecbuild_find_python.cmake | 2 +-
cmake/ecbuild_generate_config_headers.cmake | 2 +-
cmake/ecbuild_generate_rpc.cmake | 2 +-
cmake/ecbuild_generate_yy.cmake | 5 +-
cmake/ecbuild_get_date.cmake | 2 +-
cmake/ecbuild_get_resources.cmake | 2 +-
cmake/ecbuild_get_test_data.cmake | 49 +-
cmake/ecbuild_install_project.cmake | 21 +-
cmake/ecbuild_links_target.cmake | 2 +-
cmake/ecbuild_list_extra_search_paths.cmake | 2 +-
cmake/ecbuild_list_macros.cmake | 2 +-
cmake/ecbuild_pkgconfig.cmake | 10 +-
cmake/ecbuild_print_summary.cmake | 2 +-
cmake/ecbuild_project_files.cmake | 2 +-
cmake/ecbuild_requires_macro_version.cmake | 2 +-
cmake/ecbuild_separate_sources.cmake | 2 +-
cmake/ecbuild_system.cmake | 20 +-
cmake/ecbuild_use_package.cmake | 72 +--
cmake/ecbuild_version.h.in | 2 +-
cmake/ecbuild_warn_unused_files.cmake | 2 +-
cmake/include/ecbuild/boost_test_framework.h | 2 +-
cmake/sg.pl | 2 +-
scripts/CMakeLists.txt | 38 +-
scripts/metview_base.in | 3 +-
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 81 +++
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 73 +++
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 76 +++
.../app-defaults/CommonMacroFuncs/mvl_ml2hPa | 19 +-
share/metview/etc/AnnotationViewDef | 6 +
share/metview/etc/CMakeLists.txt | 1 +
share/metview/etc/CartesianViewDef | 6 +
share/metview/etc/EPSOutputDef | 2 +-
share/metview/etc/GeoToGribDef | 26 +-
share/metview/etc/GeoToGribRules | 7 +
share/metview/etc/GeoViewDef | 6 +
share/metview/etc/MCONTDef | 25 +
share/metview/etc/MCONTRules | 11 +
share/metview/etc/MWINDDef | 65 +--
share/metview/etc/MWINDRules | 2 +
share/metview/etc/MarsRules | 8 +-
share/metview/etc/ObjectList | 3 +-
share/metview/etc/PDFOutputDef | 2 +-
share/metview/etc/PNGOutputDef | 2 +-
share/metview/etc/PSOutputDef | 2 +-
share/metview/etc/ecmwf.def | 105 ++--
share/metview/etc/macro_templates.txt | 18 +
share/metview/etc/mars.chk | 8 +-
share/metview/etc/obsgroups.def | 1 +
share/metview/etc/reportypes.def | 7 +
share/metview/etc/rt_by_obsgroup.chk | 11 +-
share/metview/etc/uPlotTable | 6 +
src/Hovmoeller/MHovmoellerViewDef | 6 +
src/Macro/bufr.cc | 19 +-
src/Macro/grib.cc | 187 ++++++-
src/Macro/include/cnetcdf.h | 1 +
src/Macro/misc.cc | 1 +
src/Macro/netcdf.cc | 85 +++-
src/MagML/CMakeLists.txt | 6 +-
src/MvApp/CMakeLists.txt | 2 +-
src/MvApp/geo_to_grib.cc | 541 +++++++++++++--------
src/Reprojection/CMakeLists.txt | 6 +-
src/StdAppManager/NetcdfPlusDef | 2 +-
src/XSection/Average.cc | 2 +-
src/XSection/CrossS.cc | 2 +-
src/XSection/MVProfileViewDef | 6 +
src/XSection/MXAverageViewDef | 6 +
src/XSection/MXSectionViewDef | 6 +
src/libMars/CMakeLists.txt | 86 ++--
src/libMarsClient/CMakeLists.txt | 168 +++++++
src/libMarsClient/apibase.c | 3 +
src/libMarsClient/archive.c | 2 +-
src/libMarsClient/authenticate.c | 6 +-
src/libMarsClient/bufr.c | 12 +-
src/libMarsClient/calc.c | 6 +-
src/libMarsClient/check.c | 6 +-
src/libMarsClient/control.c | 2 +-
src/libMarsClient/dhsbase.c | 19 +-
src/libMarsClient/environ.c | 2 +-
src/libMarsClient/expand.c | 114 +++--
src/libMarsClient/field.c | 6 +-
src/libMarsClient/filebase.c | 8 +-
src/libMarsClient/flatfilebase.c | 6 +-
src/libMarsClient/gribbase.c | 10 +-
src/libMarsClient/handler.c | 6 +-
src/libMarsClient/hash.c | 2 +-
src/libMarsClient/hidden.c | 79 ++-
src/libMarsClient/hypercube.c | 4 +-
src/libMarsClient/ibmblk.c | 5 +-
src/libMarsClient/index.c | 2 +-
src/libMarsClient/logfile.c | 2 +-
src/libMarsClient/mars.h | 2 +
src/libMarsClient/mars_client_version.c.in | 16 +
src/libMarsClient/mars_client_version.h.in | 14 +
src/libMarsClient/pproc.c | 86 ++--
src/libMarsClient/proto.h | 4 +-
src/libMarsClient/restricted.c | 2 +-
src/libMarsClient/schedule.c | 2 +-
src/libMarsClient/service.c | 6 +-
src/libMarsClient/sh2ll.c | 2 +-
src/libMarsClient/tools.c | 24 +-
src/libMarsClient/version.c | 9 +-
src/libMetview/MvGrid.h | 4 +
src/libMetview/MvRequest.cc | 95 +++-
src/libMetview/MvRequest.h | 21 +-
src/libMvQtGui/MvQMainWindow.cc | 4 +-
src/libMvQtUtil/MvQNetworkProxyFactory.cc | 5 +-
src/libUtil/MvAlmostObsoleteRequest.cc | 6 +-
src/libUtil/MvVersionInfo.cc | 4 +
src/libUtil/MvVersionInfo.h | 28 +-
src/uPlot/BufrDecoder.cc | 2 +-
src/uPlot/CMakeLists.txt | 18 +-
src/uPlot/CommonXSectView.cc | 8 +
src/uPlot/CommonXSectView.h | 3 +-
src/uPlot/DataBuilder.cc | 2 +-
src/uPlot/ExportDialog.cc | 8 +
src/uPlot/GeopointsDecoder.cc | 48 +-
src/uPlot/MacroConverter.cc | 47 +-
src/uPlot/MacroVisitor.cc | 78 +--
src/uPlot/MagPlusService.cc | 16 +
src/uPlot/MagPlusService.h | 6 +
src/uPlot/MagicsTranslator.cc | 1 +
src/uPlot/MapView.cc | 34 +-
src/uPlot/ObjectInfo.cc | 171 ++++---
src/uPlot/ObjectList.cc | 10 +-
src/uPlot/ObjectList.h | 15 +-
src/uPlot/OutputFormatAction.cc | 24 +-
src/uPlot/Page.cc | 41 +-
src/uPlot/PlotAction.cc | 6 +-
src/uPlot/Presentable.cc | 364 +++++++-------
src/uPlot/Presentable.h | 2 +-
src/uPlot/SuperPage.cc | 153 +++---
test/macros/CMakeLists.txt | 6 +
test/macros/gpt_to_grib_with_template.mv | 98 ++++
test/macros/grib_to_gpt.mv | 49 ++
201 files changed, 3574 insertions(+), 1676 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