[magics] 01/07: Merge tag 'upstream/2.33.0' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/2.33.0-1
in repository magics.

commit 796d44605d041f6fdfa6b228abb6e623e97e4062
Merge: 9ecc3d2 1c365ac
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 25 10:28:20 2017 +0100

    Merge tag 'upstream/2.33.0' into debian/master

 CMakeLists.txt                              |   2 +-
 VERSION.cmake                               |   7 +-
 bin/ecbuild                                 |  10 +-
 cmake/FindNAG.cmake                         |  43 ++++++
 cmake/VERSION.cmake                         |   8 +-
 cmake/compiler_flags/Clang_C.cmake          |   2 +-
 cmake/compiler_flags/Clang_CXX.cmake        |   2 +-
 cmake/compiler_flags/GNU_Fortran.cmake      |   2 +
 cmake/compiler_flags/Intel_Fortran.cmake    |  16 ++-
 cmake/ecbuild_add_executable.cmake          |  35 +++--
 cmake/ecbuild_add_library.cmake             |  27 +++-
 cmake/ecbuild_add_test.cmake                |  21 ++-
 cmake/ecbuild_append_to_rpath.cmake         |  15 +-
 cmake/ecbuild_bundle.cmake                  |  10 +-
 cmake/ecbuild_check_os.cmake                | 171 ++++++++++++++++++++---
 cmake/ecbuild_compiler_flags.cmake          |  16 +--
 cmake/ecbuild_declare_project.cmake         |  11 +-
 cmake/ecbuild_define_paths.cmake            |  19 +--
 cmake/ecbuild_find_omp.cmake                |   4 +-
 cmake/ecbuild_get_test_data.cmake           |   9 +-
 cmake/ecbuild_git.cmake                     |   6 +-
 cmake/ecbuild_install_project.cmake         |   2 +
 cmake/ecbuild_log.cmake                     |   2 +-
 cmake/ecbuild_pkgconfig.cmake               |   2 +-
 cmake/ecbuild_remove_fortran_flags.cmake    |   6 +-
 cmake/ecbuild_setup_test_framework.cmake    |  29 +++-
 cmake/ecbuild_system.cmake                  |  15 +-
 cmake/ecbuild_uninstall.cmake.in            |  15 +-
 cmake/project-config.cmake.in               |   2 +-
 python/Magics/macro.py                      |   3 +-
 src/basic/LegendVisitor.cc                  |   3 +
 src/common/MagicsFormat.cc                  |  16 ++-
 src/common/Matrix.cc                        | 149 ++++++++++++++++++--
 src/common/Matrix.h                         |  62 ++++-----
 src/common/MatrixHandler.h                  |  28 ++++
 src/common/PolarStereographicProjection.cc  |  15 +-
 src/common/Polyline.cc                      |  53 ++++---
 src/common/Polyline.h                       |   6 +
 src/decoders/BinningObject.cc               |   4 +-
 src/decoders/GribDecoder.cc                 |  13 +-
 src/decoders/GribRegularInterpretor.cc      | 206 ++++++++++------------------
 src/decoders/NetcdfDecoder.h                |   3 +-
 src/decoders/NetcdfGeoMatrixInterpretor.cc  |  66 +--------
 src/decoders/ShapeDecoder.cc                |  35 +++--
 src/drivers/CairoDriver.cc                  |   2 +-
 src/drivers/PostScriptDriver.cc             |   2 +-
 src/magics.h                                |   6 +-
 src/params/WrepJSon.xml                     |   7 +-
 src/visualisers/CoastPlotting.cc            |   2 +
 src/visualisers/ColourTechnique.cc          |   4 +-
 src/visualisers/Contour.cc                  |   6 +-
 src/visualisers/CountSelectionType.cc       |   8 +-
 src/visualisers/GradientsColourTechnique.cc |  28 ++--
 src/visualisers/IsoPlot.cc                  |   2 +-
 src/visualisers/MarkerShadingTechnique.cc   |  16 ++-
 src/visualisers/Streamlines.cc              |   6 +-
 src/visualisers/SymbolAdvancedTableMode.cc  |   4 +-
 src/visualisers/WindPlotting.cc             |   2 +-
 src/web/WrepJSon.cc                         |   3 +-
 tools/xml2mv.py                             |  35 +++--
 60 files changed, 834 insertions(+), 470 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git