[magics] 05/31: Merge tag 'upstream_2.8.15' into debian

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 11:09:46 UTC 2015


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

mckinstry pushed a commit to branch master
in repository magics.

commit 77f5c8fb016bd649d215d79af6803fc6c2ead2dd
Merge: 67a12d6 5fd0427
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed May 22 06:13:45 2013 +0100

    Merge tag 'upstream_2.8.15' into debian

 COPYING                                            |   2 +-
 ChangeLog                                          | 630 +++++++++++++++++++++
 LICENSE                                            |   2 +-
 Makefile.in                                        |   2 +
 README                                             |  37 +-
 apps/MagMLInterpretor/Makefile.in                  |   2 +
 apps/Makefile.in                                   |   2 +
 apps/metgram/10_days_epsgram.xml                   |  86 ++-
 apps/metgram/10_days_wave_epsgram.xml              |  89 +--
 apps/metgram/15_days_epsgram.xml                   | 109 ++--
 apps/metgram/Makefile.in                           |   2 +
 configure                                          |  95 +++-
 configure.ac                                       |   7 +-
 python/Magics/Magics_interface.cc                  |   3 +
 python/Magics/Makefile.in                          |   2 +
 python/Magics/macro.py                             |  98 ++--
 python/Magics/setup.py.in                          |   1 +
 rpms/Makefile.in                                   |   2 +
 src/MagicsSingle.cc                                |  15 +-
 src/Makefile.in                                    |   2 +
 src/MvObs/Makefile.in                              |   2 +
 src/basic/BasicGraphicsObject.cc                   |   9 +-
 src/basic/BasicGraphicsObject.h                    |   3 +
 src/basic/FortranMagics.cc                         |  36 ++
 src/basic/FortranMagics.h                          |   1 +
 src/basic/Layer.cc                                 |   9 +-
 src/basic/Layer.h                                  |   2 +
 src/basic/LegendVisitor.cc                         |  36 +-
 src/basic/LegendVisitor.h                          |   3 +-
 src/basic/LegendVisitorAttributes.h                |   2 +-
 src/basic/MagnifierVisitorAttributes.h             |   2 +-
 src/basic/Makefile.in                              |   2 +
 src/basic/MultiVisdef.cc                           |  14 +
 src/basic/MultiVisdef.h                            |   1 +
 src/basic/TagHandler.cc                            |  15 +
 src/basic/TagHandler.h                             |   1 +
 src/basic/WrepRootNodeAttributes.h                 |   2 +-
 src/basic/XmlBasicNodeAttributes.h                 |   2 +-
 src/basic/XmlRootNodeAttributes.h                  |   2 +-
 src/basic/XmlSceneNodeAttributes.h                 |   2 +-
 src/basic/XmlViewNodeAttributes.h                  |   2 +-
 src/common/CartesianTransformation.h               |   1 +
 src/common/ColourTableDefinitionCompute.cc         |  41 +-
 src/common/Coordinate.h                            |   5 +-
 src/common/FortranRootSceneNodeAttributes.h        |   2 +-
 src/common/FortranSceneNodeAttributes.h            |   2 +-
 src/common/FortranViewNodeAttributes.h             |   2 +-
 src/common/GeoRectangularProjectionAttributes.h    |   2 +-
 src/common/Layout.cc                               |  14 +-
 src/common/Layout.h                                |   5 +-
 src/common/LogoPlottingAttributes.h                |   2 +-
 src/common/MagicsCalls.cc                          |  20 +-
 src/common/MagicsFormat.cc                         |   2 +-
 src/common/Makefile.in                             |   2 +
 src/common/MatrixHandler.h                         |  16 +-
 src/common/OutputHandlerAttributes.h               |   2 +-
 src/common/PageIDAttributes.h                      |   2 +-
 src/common/UserLogoPlottingAttributes.h            |   2 +-
 src/common/magics_api.h                            |   1 +
 src/decoders/BinningObjectAttributes.h             |   2 +-
 src/decoders/DateGribLoopStepAttributes.h          |   2 +-
 src/decoders/EpsXmlInput.cc                        |  10 +-
 src/decoders/EpsgramDecoder.cc                     |  16 +-
 src/decoders/GeoPointsDecoderAttributes.h          |   2 +-
 src/decoders/GribDecoderAttributes.h               |   2 +-
 src/decoders/GribLoopAttributes.h                  |   2 +-
 src/decoders/GribRegularInterpretor.cc             |  15 +-
 src/decoders/ImportActionAttributes.h              |   2 +-
 src/decoders/InputData.cc                          |  33 +-
 src/decoders/InputMatrixInterpretor.cc             |  15 +-
 src/decoders/InputMatrixInterpretor.h              |   2 +
 src/decoders/Makefile.in                           |   2 +
 src/decoders/Netcdf.cc                             |  25 +-
 src/decoders/Netcdf.h                              |  11 +-
 src/decoders/NetcdfDecoderAttributes.h             |   2 +-
 src/decoders/NetcdfGeoMatrixInterpretor.cc         |   8 +-
 .../NetcdfGeoMatrixInterpretorAttributes.h         |   2 +-
 .../NetcdfGeoPolarMatrixInterpretorAttributes.h    |   2 +-
 .../NetcdfGeoVectorInterpretorAttributes.h         |   2 +-
 .../NetcdfGeopointsInterpretorAttributes.h         |   2 +-
 src/decoders/NetcdfInterpretorAttributes.h         |   2 +-
 src/decoders/NetcdfMatrixInterpretor.cc            |  61 +-
 src/decoders/NetcdfMatrixInterpretor.h             |   7 +-
 src/decoders/NetcdfMatrixInterpretorAttributes.h   |   2 +-
 src/decoders/NetcdfVectorInterpretorAttributes.h   |   2 +-
 src/decoders/ObsDecoderAttributes.h                |   2 +-
 src/decoders/ObsStatDecoderAttributes.h            |   2 +-
 src/drivers/BaseDriverSymbols.h                    |   6 +-
 src/drivers/Makefile.in                            |   2 +
 src/drivers/PostScriptDriver.cc                    |   9 +-
 src/drivers/QtDriver.cc                            | 215 +++----
 src/libMagWrapper/Makefile.in                      |   2 +
 src/libTable/Makefile.in                           |   2 +
 src/magics_config.h                                |  14 +-
 src/magics_ecmwf_log.h                             |   2 +-
 src/oda/Makefile.in                                |   2 +
 src/oda/OdaDecoder.cc                              |   4 +-
 src/terralib/Makefile.in                           |   2 +
 src/visualisers/Akima474MethodAttributes.h         |   2 +-
 src/visualisers/Akima760.cc                        |  18 +-
 src/visualisers/Akima760MethodAttributes.h         |   2 +-
 src/visualisers/AxisAttributes.cc                  |   2 +-
 src/visualisers/AxisAttributes.h                   |   2 +-
 src/visualisers/AxisMethod.cc                      |  55 +-
 src/visualisers/AxisMethodAttributes.cc            |   2 +-
 src/visualisers/Bar.cc                             |  22 +-
 src/visualisers/BothValuePlotMethodAttributes.cc   |   2 +-
 src/visualisers/BoundariesAttributes.h             |   2 +-
 src/visualisers/BoxPlotBoxAttributes.cc            |   2 +-
 src/visualisers/BoxPlotBoxBorderAttributes.cc      |   2 +-
 src/visualisers/BoxPlotMedianAttributes.cc         |   2 +-
 src/visualisers/BoxPlotVisualiserAttributes.cc     |   2 +-
 src/visualisers/BoxPlotWhiskerBorderAttributes.cc  |   2 +-
 src/visualisers/BoxPlotWhiskerBoxAttributes.cc     |   2 +-
 src/visualisers/BoxPlotWhiskerLineAttributes.cc    |   2 +-
 .../CalculateColourTechniqueAttributes.h           |   2 +-
 src/visualisers/CdfGraphAttributes.cc              |   2 +-
 src/visualisers/CellShadingAttributes.h            |   2 +-
 src/visualisers/CoastPlottingAttributes.h          |   2 +-
 src/visualisers/CoastlinesAttributes.h             |   2 +-
 src/visualisers/ColourTechnique.cc                 |  15 +-
 src/visualisers/ContinuousLegendMethodAttributes.h |   2 +-
 src/visualisers/ContourAttributes.cc               |   2 +-
 src/visualisers/ContourAttributes.h                |   2 +-
 src/visualisers/CountSelectionTypeAttributes.h     |   2 +-
 src/visualisers/DateAxis.cc                        |  37 +-
 src/visualisers/DotPolyShadingMethodAttributes.h   |   2 +-
 src/visualisers/EfiGraphAttributes.cc              |   2 +-
 src/visualisers/EpsCloudAttributes.cc              |   2 +-
 src/visualisers/EpsGraphAttributes.cc              |   2 +-
 src/visualisers/EpsPlumeAttributes.cc              |   2 +-
 src/visualisers/EpsShadeAttributes.cc              |   2 +-
 src/visualisers/EpsWindAttributes.cc               |   2 +-
 src/visualisers/FixedTableModeAttributes.h         |   2 +-
 src/visualisers/GraphShade.cc                      |   2 -
 src/visualisers/GraphShadeStyle.cc                 |  39 +-
 src/visualisers/GridPlottingAttributes.h           |   2 +-
 src/visualisers/GridShadingAttributes.h            |   2 +-
 src/visualisers/HatchPolyShadingMethodAttributes.h |   2 +-
 src/visualisers/HiLoAttributes.cc                  |   2 +-
 src/visualisers/HiLoAttributes.h                   |   2 +-
 src/visualisers/HiLoMarkerAttributes.h             |   2 +-
 src/visualisers/HiLoNumberAttributes.h             |   2 +-
 src/visualisers/HiLoTechniqueAttributes.h          |   2 +-
 src/visualisers/HiLoTextAttributes.h               |   2 +-
 src/visualisers/HistogramAttributes.cc             |   2 +-
 src/visualisers/HistogramLegendMethodAttributes.h  |   2 +-
 src/visualisers/ImagePlottingAttributes.h          |   2 +-
 src/visualisers/ImportPlotAttributes.h             |   2 +-
 src/visualisers/IntervalSelectionType.cc           |  21 +-
 src/visualisers/IntervalSelectionTypeAttributes.h  |   2 +-
 src/visualisers/IsoHighlightAttributes.h           |   2 +-
 src/visualisers/IsoLabelAttributes.h               |   2 +-
 src/visualisers/IsoPlot.cc                         |  18 +-
 src/visualisers/IsoPlotAttributes.cc               |   2 +-
 src/visualisers/IsoPlotAttributes.h                |   2 +-
 src/visualisers/IsoShading.h                       |  10 +-
 src/visualisers/IsoShadingAttributes.cc            |   2 +-
 src/visualisers/IsoShadingAttributes.h             |   2 +-
 src/visualisers/LabelPlottingAttributes.h          |   2 +-
 src/visualisers/LegendBoxAttributes.h              |   2 +-
 src/visualisers/LevelListSelectionTypeAttributes.h |   2 +-
 src/visualisers/LevelSelectionAttributes.h         |   2 +-
 src/visualisers/ListColourTechniqueAttributes.h    |   2 +-
 src/visualisers/LookupTableModeAttributes.h        |   2 +-
 src/visualisers/Makefile.in                        |   2 +
 src/visualisers/MarkerShadingTechniqueAttributes.h |   2 +-
 src/visualisers/MetgramCurveAttributes.cc          |   2 +-
 src/visualisers/MetgramFlagsAttributes.cc          |   2 +-
 src/visualisers/MetgramGraphAttributes.cc          |   2 +-
 src/visualisers/NoGridPlottingAttributes.h         |   2 +-
 src/visualisers/ObsItemFamily.cc                   |   6 +-
 src/visualisers/ObsPlotting.cc                     |   7 +-
 src/visualisers/ObsPlottingAttributes.h            |   2 +-
 src/visualisers/PolyShadingMethod.cc               |  38 +-
 src/visualisers/PolyShadingTechnique.cc            |   6 +-
 src/visualisers/PolyShadingTechniqueAttributes.cc  |   2 +-
 src/visualisers/PolyShadingTechniqueAttributes.h   |   2 +-
 src/visualisers/SampleContourMethodAttributes.h    |   2 +-
 src/visualisers/SegmentJoiner.cc                   |   5 +-
 src/visualisers/SymbolIndividualModeAttributes.h   |   2 +-
 src/visualisers/SymbolTableModeAttributes.h        |   2 +-
 src/visualisers/WindPlotting.cc                    |   3 +-
 src/web/Makefile.in                                |   2 +
 src/web/ObsJSon.cc                                 |  14 +-
 src/web/ObsJSon.h                                  |   6 +-
 src/web/ObsJSonAttributes.cc                       |   2 +-
 src/web/WrepJSonAttributes.cc                      |   2 +-
 src/xml/Makefile.in                                |   2 +
 src/xml/graph_params.xml                           |  14 +-
 test/C/Makefile.in                                 |   2 +
 test/MagML/Makefile.in                             |   2 +
 test/Makefile.in                                   |   2 +
 test/fortran/Makefile.in                           |   2 +
 test/python/Makefile.in                            |   2 +
 tools/Makefile.in                                  |   2 +
 version.sh                                         |   6 +-
 197 files changed, 1768 insertions(+), 688 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