[metview] 03/06: Merge branch 'upstream' (4.5.7 release) into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 21 19:38:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository metview.
commit d1cc62a4fbf44c7cdd71a806c364b27f163336fb
Merge: 79c80f3 3fbb6c5
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Oct 20 20:00:55 2015 +0100
Merge branch 'upstream' (4.5.7 release) into debian/master
CMakeLists.txt | 180 ++++--
VERSION.cmake | 2 +-
cmake/CheckFortranSourceCompiles.cmake | 2 +-
cmake/FindAEC.cmake | 2 -
cmake/FindArmadillo.cmake | 33 +-
cmake/FindEMOS.cmake | 2 -
cmake/FindEcLib.cmake | 49 --
cmake/FindEcregrid.cmake | 48 --
cmake/FindLibIFort.cmake | 47 ++
cmake/FindMKL.cmake | 77 +++
cmake/FindNetCDF.cmake | 145 +++--
cmake/FindNetCDF3.cmake | 65 +-
cmake/FindOpenCL.cmake | 67 ++
cmake/FindOpenJPEG.cmake | 3 +-
cmake/FindPango.cmake | 2 -
cmake/FindPangoCairo.cmake | 13 +-
cmake/FindProj4.cmake | 10 +-
cmake/FindSZip.cmake | 2 -
cmake/FindScin.cmake | 48 --
cmake/FindTrilinos.cmake | 3 -
cmake/FindViennaCL.cmake | 38 ++
cmake/Findgrib_api.cmake | 2 -
cmake/Findodb_api.cmake | 2 -
cmake/Findspot.cmake | 2 -
cmake/VERSION.cmake | 4 +-
cmake/contrib/FindEigen3.cmake | 10 +-
cmake/contrib/FindFFTW.cmake | 52 +-
cmake/contrib/FindNetCDF4.cmake | 14 +-
cmake/ecbuild_add_cxx11_flags.cmake | 20 +-
cmake/ecbuild_add_executable.cmake | 433 ++++++++-----
cmake/ecbuild_add_extra_search_paths.cmake | 23 +-
cmake/ecbuild_add_library.cmake | 688 ++++++++++++---------
cmake/ecbuild_add_option.cmake | 184 ++++--
cmake/ecbuild_add_persistent.cmake | 92 ++-
cmake/ecbuild_add_resources.cmake | 95 ++-
cmake/ecbuild_add_test.cmake | 610 ++++++++++--------
cmake/ecbuild_append_to_rpath.cmake | 35 +-
cmake/ecbuild_bundle.cmake | 338 ++++------
cmake/ecbuild_cache.cmake | 34 +-
cmake/ecbuild_check_c_source.cmake | 73 ++-
cmake/ecbuild_check_compiler.cmake | 28 +-
cmake/ecbuild_check_cxx11.cmake | 76 ++-
cmake/ecbuild_check_cxx_source.cmake | 73 ++-
cmake/ecbuild_check_fortran_source.cmake | 68 +-
cmake/ecbuild_check_functions.cmake | 65 +-
cmake/ecbuild_check_os.cmake | 54 +-
cmake/ecbuild_config.h.in | 25 +
cmake/ecbuild_debug_var.cmake | 12 +
cmake/ecbuild_declare_project.cmake | 216 ++++---
cmake/ecbuild_define_build_types.cmake | 43 +-
cmake/ecbuild_define_options.cmake | 8 +-
cmake/ecbuild_define_uninstall.cmake | 7 +
cmake/ecbuild_dont_pack.cmake | 82 +++
cmake/ecbuild_download_resource.cmake | 47 ++
cmake/ecbuild_echo_targets.cmake | 67 +-
cmake/ecbuild_enable_fortran.cmake | 80 ++-
cmake/ecbuild_features.cmake | 121 ++++
cmake/ecbuild_find_fortranlibs.cmake | 210 ++++---
cmake/ecbuild_find_lexyacc.cmake | 96 +--
cmake/ecbuild_find_mpi.cmake | 118 +++-
cmake/ecbuild_find_omp.cmake | 72 ++-
cmake/ecbuild_find_package.cmake | 394 ++++++++----
cmake/ecbuild_find_perl.cmake | 76 ++-
cmake/ecbuild_find_python.cmake | 74 ++-
cmake/ecbuild_generate_config_headers.cmake | 62 +-
cmake/ecbuild_generate_rpc.cmake | 31 +-
cmake/ecbuild_generate_yy.cmake | 227 ++++---
cmake/ecbuild_get_cxx11_flags.cmake | 71 +++
cmake/ecbuild_get_date.cmake | 28 +-
cmake/ecbuild_get_test_data.cmake | 206 ++++--
cmake/ecbuild_git.cmake | 307 +++++++++
...package.cmake => ecbuild_install_project.cmake} | 156 +++--
cmake/ecbuild_list_extra_search_paths.cmake | 53 +-
cmake/ecbuild_list_macros.cmake | 33 +
cmake/ecbuild_log.cmake | 129 ++++
cmake/ecbuild_pkgconfig.cmake | 168 +++--
cmake/ecbuild_policies.cmake | 63 ++
cmake/ecbuild_print_summary.cmake | 177 +++---
cmake/ecbuild_project_files.cmake | 60 +-
cmake/ecbuild_requires_macro_version.cmake | 12 +
cmake/ecbuild_separate_sources.cmake | 32 +-
cmake/ecbuild_setup_test_framework.cmake | 47 +-
cmake/ecbuild_system.cmake | 387 ++++++------
cmake/ecbuild_uninstall.cmake.in | 21 +
cmake/ecbuild_use_package.cmake | 353 ++++++-----
cmake/ecbuild_warn_unused_files.cmake | 29 +-
cmake/pkg-config.pc.in | 8 +-
cmake/project-config.cmake.in | 11 +-
cmake/pymain.c | 5 +
scripts/CMakeLists.txt | 83 ++-
scripts/CONFIG.site.in | 38 --
scripts/compile.in | 4 +-
scripts/generate_icon_fun_help.mv | 5 +-
scripts/{metview_base => metview_base.in} | 87 ++-
share/metview/app-defaults/CMakeLists.txt | 12 +-
share/metview/etc/CMakeLists.txt | 42 +-
share/metview/etc/EPSOutputDef | 8 +-
share/metview/etc/MCOASTDef | 26 +
share/metview/etc/MCOASTRules | 3 +
share/metview/etc/MSYMBRules | 2 +-
share/metview/etc/PDFOutputDef | 6 +-
share/metview/etc/PNGOutputDef | 6 +-
share/metview/etc/PSOutputDef | 8 +-
share/metview/etc/ecmwf.def | 47 +-
share/metview/etc/obsgroups.def | 1 +
share/metview/etc/reportypes.def | 16 +
share/metview/etc/rt_by_obsgroup.chk | 15 +-
share/metview/etc/uPlotTable | 2 +-
share/metview/icons/CMakeLists.txt | 17 +-
share/metview/icons_mv5/CMakeLists.txt | 6 +-
src/AppMod/CMakeLists.txt | 15 +-
src/BufrExaminer/CMakeLists.txt | 7 +-
src/DebugTools/CMakeLists.txt | 20 +-
src/DebugTools/XServ.h | 6 +-
src/Desktop/CMakeLists.txt | 17 +-
src/Desktop/Editor.h | 2 +-
src/Desktop/MvQDetailedFolderView.cc | 4 +
src/Desktop/MvQFileBrowser.cc | 35 +-
src/Desktop/MvQFileBrowser.h | 3 +
src/Desktop/MvQFolderModel.cc | 12 +-
src/Desktop/MvQIconFolderView.cc | 9 +-
src/Desktop/MvQIconHolder.cc | 2 +-
src/Desktop/MvQIconMimeData.cc | 4 +-
src/Desktop/MvQIconObjectModel.cc | 2 +-
src/Desktop/MvQListFolderViewBase.cc | 1 +
src/Desktop/MvQNewIconWidget.cc | 1 +
src/Desktop/MvQProductBrowser.cc | 2 +-
src/Desktop/ViewEditor.cc | 7 +-
src/FlextraExaminer/CMakeLists.txt | 7 +-
src/GeopExaminer/CMakeLists.txt | 6 +-
src/GeopExaminer/MvGeoPointsModel.cc | 2 +-
src/GribExaminer/CMakeLists.txt | 6 +-
src/GribExaminer/MvQGribDumpModel.cc | 12 +-
src/Hovmoeller/HovToolkit.cc | 19 +-
src/MacroEditor/CMakeLists.txt | 14 +-
src/MacroEditor/CodeTemplateDialog.cc | 6 +-
src/MacroEditor/FunctionListDialog.cc | 6 +-
src/MacroEditor/GotoLineDialog.cc | 6 +-
src/MacroEditor/MacroEdit.cc | 8 +-
src/MacroEditor/VerbFunctionHelp.cc | 6 +-
src/MacroEditor/VerbFunctionHelpDialog.cc | 6 +-
src/MacroEditor/mvplaintextedit.h | 7 +-
src/MagML/CMakeLists.txt | 3 +
src/MarsCatalog/CMakeLists.txt | 10 +-
src/MarsCatalog/ObjectSpec.MarsCatalog | 2 +-
src/MetviewUI/CMakeLists.txt | 2 +-
src/MvApp/grib_to_geo.cc | 4 +-
src/NcExaminer/CMakeLists.txt | 7 +-
src/OdbExaminer/CMakeLists.txt | 7 +-
src/OdbExaminer/MvQOdbStatModel.cc | 5 +-
src/OgcClient/CMakeLists.txt | 15 +-
src/OgcClient/MvQWmsClientEditor.cc | 4 +-
src/OgcClient/ObjectSpec.WcsClient | 2 +-
src/OgcClient/ObjectSpec.WmsClient | 2 +-
src/Reprojection/CMakeLists.txt | 3 +
src/ScmEditor/CMakeLists.txt | 11 +-
src/StdAppManager/NetcdfPlusRules | 4 -
src/Thermo/BufrThermo.cc | 114 ++--
src/Thermo/BufrThermo.h | 3 +
src/Thermo/CMakeLists.txt | 9 +-
src/Thermo/GribThermo.cc | 37 +-
src/Thermo/MTHERMO.svg | 390 ++++++++++++
src/Thermo/MTHERMOGRID.svg | 377 +++++++++++
src/Thermo/MTHERMOGRIDDef | 322 ++++++++++
src/Thermo/MTHERMOGRIDRules | 62 ++
src/Thermo/MThermoDef | 114 ++++
src/Thermo/MThermoRules | 4 +
src/Thermo/ObjectSpec.Thermo | 28 +
src/Thermo/Thermo.cc | 52 +-
src/Thermo/Thermo.h | 7 +-
src/WebAccess/CMakeLists.txt | 2 +-
src/XSection/Average.cc | 17 +-
src/XSection/Average.h | 2 +-
src/XSection/CrossS.cc | 397 +++++++-----
src/XSection/CrossS.h | 13 +-
src/XSection/MXSectionCommonDef | 35 ++
src/XSection/MXSectionCommonRules | 13 +
src/XSection/MXSectionDef | 10 +
src/XSection/MXSectionRules | 10 +
src/XSection/MXSectionViewDef | 8 +-
src/XSection/MvXsectFrame.cc | 436 ++++++++++---
src/XSection/MvXsectFrame.h | 102 ++-
src/XSection/Vprofile.cc | 6 +-
src/XSection/Vprofile.h | 2 +-
src/XSection/Xsect.cc | 339 +++++-----
src/XSection/Xsect.h | 35 +-
src/libMars/CMakeLists.txt | 9 +-
src/libMarsClient/nfdbbase.c | 10 +-
src/libMarsClient/pproc.c | 12 +-
src/libMetview/MvFieldSet.cc | 18 +-
src/libMetview/MvFieldSet.h | 3 -
src/libMetview/MvGrid.cc | 57 +-
src/libMvQtGui/CMakeLists.txt | 9 +-
src/libMvQtGui/MvQAbout.cc | 6 +
src/libMvQtGui/MvQApplication.h | 6 +-
src/libMvQtGui/MvQDragDrop.cc | 1 +
src/libMvQtGui/MvQFileDialog.cc | 5 +-
src/libMvQtGui/MvQKeyFilterModel.cc | 6 +-
src/libMvQtGui/MvQKeyModel.cc | 2 +-
src/libMvQtGui/MvQKeyProfileModel.cc | 2 +-
src/libMvQtGui/MvQKeyProfileTree.cc | 10 +-
src/libMvQtGui/MvQOdbModel.cc | 7 +-
src/libMvQtGui/MvQProfileView.cc | 6 +-
src/libMvQtGui/MvQScmModel.cc | 14 +-
src/libMvQtGui/MvQStationsWidget.cc | 2 +-
src/libMvQtGui/MvQX11Application.h | 6 +-
src/libMvQtUtil/CMakeLists.txt | 7 +-
src/libMvQtUtil/MvQKeyManager.cc | 9 +-
src/libMvQtUtil/MvQKeyManager.h | 6 +-
src/libMvQtUtil/MvQNetworkAccessManager.cc | 9 +-
src/libMvQtUtil/MvQNetworkAccessManager.h | 7 +-
src/libMvQtUtil/MvQNetworkProxyFactory.cc | 4 +-
src/libMvQtUtil/MvQNetworkProxyFactory.h | 6 +-
src/libMvQtUtil/MvQVisDefManager.cc | 10 +-
src/libMvQtUtil/MvQXmlQuery.h | 12 +-
src/uPlot/CMakeLists.txt | 35 +-
src/uPlot/CartesianView.cc | 13 +-
src/uPlot/CartesianView.h | 95 ++-
src/uPlot/CommonXSectView.cc | 95 ++-
src/uPlot/CommonXSectView.h | 15 +-
src/uPlot/DataObject.cc | 75 ++-
src/uPlot/ExportDialog.cc | 6 +
src/uPlot/MagPlusService.h | 2 +
src/uPlot/MagicsTranslator.cc | 34 +-
src/uPlot/MvCallback.hpp | 2 +-
src/uPlot/MvQDataWidget.cc | 2 +-
src/uPlot/MvQLayerModel.cc | 4 +-
src/uPlot/MvQZoomStackWidget.cc | 6 +-
src/uPlot/MvQZoomStackWidget.h | 6 +-
src/uPlot/ObjectList.cc | 12 +
src/uPlot/ObjectList.h | 2 +
src/uPlot/PlotModConst.h | 24 +-
src/uPlot/PlotModView.cc | 41 +-
src/uPlot/ThermoView.cc | 125 +++-
src/uPlot/ThermoView.h | 13 +-
src/uPlot/uPlotBase.cc | 4 +-
test/macros/CMakeLists.txt | 16 +
test/macros/post_install_tests.sh.in | 30 +
238 files changed, 9156 insertions(+), 3820 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