[magics] 01/03: Merge tag 'upstream/2.34.1' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 091c38e07a96f768fa6c486cbe67b2e5b18996b3
Merge: d07dc33 c74b73c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 17 15:23:29 2017 +0100

    Merge tag 'upstream/2.34.1' into debian/master

 CMakeLists.txt                                     |   4 +-
 VERSION.cmake                                      |   2 +-
 bin/magjsonx                                       | Bin 0 -> 39201 bytes
 bin/magmlx                                         | Bin 0 -> 38585 bytes
 bin/metgramx                                       | Bin 0 -> 66389 bytes
 cmake/VERSION.cmake                                |   4 +-
 .../GreatCMakeCookOff/CheckCXX11Features.cmake     |   4 +-
 cmake/ecbuild_add_persistent.cmake                 |   4 +-
 cmake/ecbuild_add_resources.cmake                  |   7 +
 cmake/ecbuild_check_c_source_return.cmake          |  14 +-
 cmake/ecbuild_check_compiler.cmake                 |   4 +
 cmake/ecbuild_check_cxx11.cmake                    |   2 +-
 cmake/ecbuild_check_cxx_source_return.cmake        |  10 +-
 cmake/ecbuild_check_fortran_source_return.cmake    |   6 +-
 cmake/ecbuild_check_functions.cmake                |   2 +
 cmake/ecbuild_check_os.cmake                       |   1 +
 cmake/ecbuild_config.h.in                          |   2 +
 cmake/ecbuild_find_fortranlibs.cmake               |   4 +-
 cmake/ecbuild_find_package.cmake                   |   6 +-
 cmake/ecbuild_system.cmake                         |   1 +
 cmake/ecbuild_try_run.cmake                        | 200 +++++++++++++++++++
 cmake/ecbuild_use_package.cmake                    |  58 +++---
 cmake/fortran_features/CheckFortranFeatures.cmake  |   4 +-
 cmake/sg.pl                                        |   5 +-
 project_summary.cmake                              |   4 -
 python/CMakeLists.txt                              |  10 +-
 python/Magics/toolbox.py                           |  20 +-
 share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake     |  87 +++++++++
 share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake      |  87 +++++++++
 share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake    |  87 +++++++++
 share/magics/cream/coastlines.json                 |  41 ++++
 share/magics/cream/contours.json                   |  58 ++++++
 share/magics/dark/coastlines.json                  |  88 +++++++++
 share/magics/dark/contours.json                    |  58 ++++++
 share/magics/efas/CurrentDomain/lines.dbf          | Bin 0 -> 6327690 bytes
 share/magics/efas/CurrentDomain/lines.prj          |   1 +
 share/magics/efas/CurrentDomain/lines.shp          | Bin 0 -> 22273340 bytes
 share/magics/efas/CurrentDomain/lines.shx          | Bin 0 -> 2024940 bytes
 share/magics/efas/ExtendedDomain/lines.dbf         | Bin 0 -> 14886815 bytes
 share/magics/efas/ExtendedDomain/lines.prj         |   1 +
 share/magics/efas/ExtendedDomain/lines.shp         | Bin 0 -> 52401460 bytes
 share/magics/efas/ExtendedDomain/lines.shx         | Bin 0 -> 4763860 bytes
 share/magics/epsg.json                             |  10 +-
 share/magics/projections.json                      | 214 +++++++++++++++++++++
 src/basic/BasicSceneObject.h                       |   5 +
 src/basic/RootSceneNode.h                          |   2 +
 src/basic/SceneNode.cc                             |  10 +-
 src/basic/SceneNode.h                              |   2 +
 src/basic/ViewNode.cc                              |  17 +-
 src/basic/ViewNode.h                               |   2 +-
 src/basic/Visdef.h                                 |   2 +
 src/basic/VisualAction.cc                          |   1 +
 src/basic/VisualAction.h                           |   2 +-
 src/common/ColourTableDefinitionCompute.cc         |   4 +-
 src/common/GeoRectangularProjection.cc             |  14 +-
 src/common/GeoRectangularProjection.h              |   1 +
 src/common/Proj4Projection.cc                      |  46 +++--
 src/common/Transformation.h                        |   2 +-
 src/decoders/GribDecoder.cc                        |  34 ++--
 src/decoders/NetcdfGeoMatrixInterpretor.cc         |   2 +-
 src/decoders/NetcdfInterpretor.cc                  |   2 +-
 src/decoders/ShapeDecoder.cc                       |   1 -
 src/drivers/BaseDriver.cc                          |   2 +-
 src/libMagWrapper/MagPlus.cc                       |   2 +-
 src/params/Coastlines.xml                          |  22 ++-
 src/params/FortranRootSceneNode.xml                |  13 +-
 src/params/FortranSceneNode.xml                    |   5 +-
 src/params/FortranViewNode.xml                     |  10 +-
 src/params/GridPlotting.xml                        |  26 +++
 src/params/NoCoastPlotting.xml                     |  51 +++++
 src/params/SymbolPlotting.xml                      |  11 ++
 src/visualisers/AxisItem.cc                        |   7 +
 src/visualisers/AxisItem.h                         |   2 +
 src/visualisers/CalcStreamlines.cc                 |   7 +-
 src/visualisers/CoastPlotting.cc                   |  70 +++++++
 src/visualisers/CoastPlotting.h                    |   2 +
 src/visualisers/Coastlines.cc                      |  17 +-
 src/visualisers/Contour.cc                         |  12 +-
 src/visualisers/ContourLibrary.cc                  |  47 ++++-
 src/visualisers/ContourLibrary.h                   |  26 +++
 src/visualisers/Curve.h                            |   3 +-
 src/visualisers/DateAxis.cc                        |  80 +++++++-
 src/visualisers/DateAxis.h                         |   2 +
 src/visualisers/EpsGraph.cc                        | 132 +++++++------
 src/visualisers/EpsGraph.h                         |   4 +
 src/visualisers/GridPlotting.cc                    |  11 ++
 src/visualisers/GridPlotting.h                     |   1 +
 src/visualisers/LevelListSelectionType.cc          |   9 +-
 src/visualisers/SymbolPlotting.cc                  |  13 ++
 src/visualisers/SymbolPlotting.h                   |   4 +-
 src/web/MagConfig.cc                               |  39 +++-
 src/web/MagConfig.h                                |  21 ++
 92 files changed, 1673 insertions(+), 237 deletions(-)

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