[magics] 47/63: Merge tag 'upstream/2.30.0' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 797d2596b04258a5e24f3300a0b7a42ce9b01a8d
Merge: 6d0b405 ca2ccbb
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Nov 28 15:18:48 2016 +0000
Merge tag 'upstream/2.30.0' into debian/master
CMakeLists.txt | 6 +-
VERSION.cmake | 4 +-
apps/metgram/metgram | 2 +-
bin/ecbuild | 4 +-
cmake/CheckFortranCompilerFlag.cmake | 37 -
cmake/CheckFortranSourceCompiles.cmake | 94 --
cmake/{contrib => }/FindFFTW.cmake | 6 -
cmake/FindGeoTIFF.cmake | 64 +-
cmake/FindOpenJPEG.cmake | 60 +-
cmake/VERSION.cmake | 4 +-
.../CMakeCheckCompilerFlagCommonPatterns.cmake | 33 +
cmake/contrib/CheckFortranCompilerFlag.cmake | 72 +-
cmake/contrib/CheckFortranSourceCompiles.cmake | 133 +-
cmake/contrib/FindNetCDF4.cmake | 4 +-
cmake/ecbuild_add_option.cmake | 21 +-
cmake/ecbuild_add_test.cmake | 61 +-
cmake/ecbuild_check_cxx11.cmake | 147 +-
cmake/ecbuild_define_paths.cmake | 23 +-
cmake/ecbuild_find_omp.cmake | 4 +-
cmake/ecbuild_get_test_data.cmake | 14 +-
cmake/ecbuild_log.cmake | 2 +-
notebook/WCS.ipynb | 156 +++
notebook/epsgrams.ipynb | 304 ++++
python/CMakeLists.txt | 3 +-
python/Magics/macro.py | 844 +++++------
python/Magics/toolbox.py | 248 ++++
python/Magics_interface.cc | 5 +-
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 14 +-
share/magics/C3S_combined.svg | 581 ++++++++
share/magics/table_128.xml | 1477 +++-----------------
share/magics/table_129.xml | 1408 ++-----------------
share/magics/table_130.xml | 185 +--
share/magics/table_131.xml | 73 +-
share/magics/table_132.xml | 38 +-
share/magics/table_140.xml | 262 +---
share/magics/table_150.xml | 227 +--
share/magics/table_151.xml | 321 +----
share/magics/table_160.xml | 867 ++----------
share/magics/table_162.xml | 10 +-
share/magics/table_170.xml | 161 +--
share/magics/table_171.xml | 1298 +----------------
share/magics/table_172.xml | 262 +---
share/magics/table_173.xml | 10 +-
share/magics/table_174.xml | 185 +--
share/magics/table_175.xml | 185 +--
share/magics/table_180.xml | 227 +--
share/magics/table_190.xml | 248 +---
share/magics/table_2.xml | 17 +-
share/magics/table_200.xml | 1455 ++-----------------
share/magics/table_210.xml | 486 +------
share/magics/table_254.xml | 657 +--------
share/magics/table_260.xml | 17 +-
src/basic/FortranMagics.cc | 11 +
src/basic/FortranMagics.h | 1 +
src/basic/LegendVisitor.cc | 24 +-
src/common/Colour.h | 2 +-
src/common/Data.h | 2 +-
src/common/LogoPlotting.cc | 17 +-
src/common/LogoPlotting.h | 2 +-
src/common/MagicsCalls.cc | 5 +
src/common/Symbol.cc | 8 +
src/common/magics_api.h | 2 +
src/decoders/EpsXmlInput.cc | 8 +-
src/decoders/GribDecoder.cc | 7 +-
src/decoders/GribRegularInterpretor.cc | 9 +-
src/decoders/LocalTable.h | 6 +-
src/drivers/CairoDriver.cc | 128 +-
src/libMagWrapper/MagPlus.cc | 13 +-
src/params/Axis.xml | 23 +-
src/params/BinaryObject.xml | 4 +
src/params/LogoPlotting.xml | 7 +-
src/params/SymbolPlotting.xml | 3 +-
src/visualisers/Axis.cc | 35 +-
src/visualisers/EpsGraph.cc | 181 ++-
src/visualisers/EpsGraph.h | 36 +
src/visualisers/GridPlotting.cc | 10 +-
src/web/WrepJSon.cc | 101 +-
src/web/WrepJSon.h | 5 +-
test/CMakeLists.txt | 13 +-
tools/axis2doc.py | 2 +-
tools/newbase.pl | 2 +-
tools/newclass.pl | 2 +-
tools/newdriver.pl | 2 +-
tools/newfactory.pl | 2 +-
tools/newprojection.pl | 2 +-
tools/newtemplate.pl | 2 +-
tools/xml2cc.pl | 2 +-
tools/xml2cc.pl.workshop | 2 +-
tools/xml2cc_list.pl | 2 +-
tools/xml2doc.pl | 2 +-
tools/xml2dtd.pl | 2 +-
tools/xml2html.py | 2 +-
tools/xml2icon.pl | 2 +-
tools/xml2mv.pl | 2 +-
tools/xml2mv.py | 2 +-
tools/xml2odt.py | 2 +-
98 files changed, 3436 insertions(+), 10315 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list