[metview] 13/20: Merge tag 'upstream/4.7.0' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Oct 29 13:50:48 UTC 2016


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

mckinstry pushed a commit to tag debian/4.7.2-1
in repository metview.

commit ef28146f3b5f2d90c373c50baa49cffb80d7e7c9
Merge: 872d31b f5a6c84
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Sep 14 23:30:40 2016 +0100

    Merge tag 'upstream/4.7.0' into debian/master

 CMakeLists.txt                                     |   9 +
 LICENSE                                            |   2 +-
 NOTICE                                             |   2 +-
 VERSION.cmake                                      |   4 +-
 project_summary.cmake                              |   5 +
 share/metview/etc/AnnotationViewDef                |   4 +-
 share/metview/etc/AxisDef                          |   2 +-
 share/metview/etc/BinningObjectDef                 |   2 +-
 share/metview/etc/CMakeLists.txt                   |   2 +-
 share/metview/etc/CoastDef                         |   2 +-
 share/metview/etc/ContDef                          |   2 +-
 share/metview/etc/EPSOutputDef                     |  14 --
 share/metview/etc/GeoToGribDef                     |   3 +
 share/metview/etc/GeoToGribRules                   |   3 +
 share/metview/etc/GraphDef                         |   2 +-
 share/metview/etc/KMLOutputDef                     |  14 --
 share/metview/etc/MAXISDef                         |   2 +-
 share/metview/etc/MBOXPLOTDef                      |   2 +-
 share/metview/etc/MCOASTDef                        |   2 +-
 share/metview/etc/MCONTDef                         |   2 +-
 share/metview/etc/MGRAPHDef                        |   2 +-
 share/metview/etc/MLEGENDDef                       |   2 +-
 share/metview/etc/MSYMBDef                         |   2 +-
 share/metview/etc/MTAYLORDef                       |   2 +-
 share/metview/etc/MTEXTDef                         |   2 +-
 share/metview/etc/MTHERMOGRIDDef                   |   2 +-
 share/metview/etc/MWINDDef                         |   2 +-
 .../etc/{MagicsColors.h => MagicsColours.txt}      |   0
 share/metview/etc/ObjectList                       |   2 +-
 share/metview/etc/ObsPlottingDef                   |   2 +-
 share/metview/etc/PDFOutputDef                     |  14 --
 share/metview/etc/PNGOutputDef                     |  14 --
 share/metview/etc/PSOutputDef                      |  14 --
 share/metview/etc/PageFrameDef                     |   4 +-
 share/metview/etc/PlotPageDef                      |   2 +-
 share/metview/etc/SVGOutputDef                     |  14 --
 share/metview/etc/SubpageFrameDef                  |   4 +-
 share/metview/etc/SymbDef                          |   2 +-
 share/metview/etc/TextDef                          |   2 +-
 share/metview/etc/WindDef                          |   2 +-
 share/metview/etc/licence_for_about_box.txt        |   2 +-
 share/metview/icons/FLEXTRA_FILE.xpm               |   0
 share/metview/icons/FLEXTRA_PREPARE.xpm            |   0
 share/metview/icons/FLEXTRA_RUN.xpm                |   0
 share/metview/icons/FLEXTRA_VISUALISER.xpm         |   0
 share/metview/icons/INPUTVISUALISER.xpm            |   0
 share/metview/icons/NETCDFPLUS.xpm                 |   0
 share/metview/icons/ODB_DB.xpm                     |   0
 share/metview/icons/ODB_VISUALISER.xpm             |   0
 share/metview/icons/TABLEVISUALISER.xpm            |   0
 share/metview/icons/help_area.xpm                  |   0
 share/metview/icons/help_line.xpm                  |   0
 share/metview/icons/help_map.xpm                   |   0
 share/metview/icons/help_point.xpm                 |   0
 share/metview/icons/help_station.xpm               |   0
 share/metview/icons_mv5/AVERAGE.xpm                |   0
 share/metview/icons_mv5/AVERAGEVIEW.xpm            |   0
 share/metview/icons_mv5/GRIBVECTORS.xpm            |   0
 share/metview/icons_mv5/GeoToKML.xpm               |   0
 share/metview/icons_mv5/HOVMOELLERDATA.xpm         |   0
 share/metview/icons_mv5/INPUTVISUALISER.svg        |   0
 share/metview/icons_mv5/Interpolation.svg          |   0
 share/metview/icons_mv5/MAGML.xpm                  |   0
 share/metview/icons_mv5/MHOVMOELLERDATA.xpm        |   0
 share/metview/icons_mv5/MHOVMOELLERVIEW.xpm        |   0
 share/metview/icons_mv5/MTHERMO.xpm                |   0
 share/metview/icons_mv5/MVPROFILE.xpm              |   0
 share/metview/icons_mv5/MVPROFILEVIEW.xpm          |   0
 share/metview/icons_mv5/MXAVERAGE.xpm              |   0
 share/metview/icons_mv5/MXAVERAGEVIEW.xpm          |   0
 share/metview/icons_mv5/MXSECTION.xpm              |   0
 share/metview/icons_mv5/MXSECTIONVIEW.xpm          |   0
 share/metview/icons_mv5/MetPlus.xpm                |   0
 share/metview/icons_mv5/NETCDFPLUS.svg             |   0
 share/metview/icons_mv5/OBSTAT.xpm                 |   0
 share/metview/icons_mv5/OBSTAT_CURVE.xpm           |   0
 share/metview/icons_mv5/OBSTAT_SCATTER.xpm         |   0
 share/metview/icons_mv5/ODB_MARS.xpm               |   0
 share/metview/icons_mv5/REPROJECTION.xpm           |   0
 share/metview/icons_mv5/TABLEVISUALISER.svg        |   0
 share/metview/icons_mv5/THERMODATA.xpm             |   0
 share/metview/icons_mv5/VPROF.xpm                  |   0
 share/metview/icons_mv5/VPROFILE.xpm               |   0
 share/metview/icons_mv5/VPROFVIEW.xpm              |   0
 share/metview/icons_mv5/WEBACCESS.xpm              |   0
 share/metview/icons_mv5/XAVERAGE.xpm               |   0
 share/metview/icons_mv5/XSECT.xpm                  |   0
 share/metview/icons_mv5/XSECTION.xpm               |   0
 share/metview/icons_mv5/XSECTVIEW.xpm              |   0
 src/BufrExaminer/BufrMetaData.cc                   |  67 +++---
 src/CMakeLists.txt                                 |   5 +-
 src/Desktop/EditTransaction.cc                     |   3 +-
 src/Desktop/FolderInfo.cc                          |   1 -
 src/Desktop/MvQColourLine.cc                       |   4 +-
 src/Desktop/MvQDetailedFolderView.cc               |   5 +-
 src/Desktop/MvQFolderItemProperty.cc               |   7 +-
 src/Desktop/MvQFolderItemProperty.h                |   5 +-
 src/Desktop/MvQFolderViewBase.cc                   |   3 -
 src/Desktop/MvQIconFolderView.cc                   |   5 +-
 src/Desktop/MvQPageView.cc                         |  25 +--
 src/Desktop/MvQRequestPanelLine.cc                 |   6 +-
 src/Download/CMakeLists.txt                        |  12 +
 src/Download/DOWNLOAD.svg                          | 226 +++++++++++++++++++
 src/Download/Download.cc                           | 208 +++++++++++++++++
 src/Download/DownloadDef                           |  12 +
 src/Download/ObjectSpec.Download                   |  29 +++
 src/Hovmoeller/HovToolkit.cc                       |   4 +-
 src/Macro/grib.cc                                  |  54 ++++-
 src/Macro/include/macro.h                          |   2 -
 src/Macro/mlist.cc                                 |   2 +-
 src/Macro/request.cc                               |   3 +
 src/Macro/value.cc                                 |   4 +-
 src/MacroEditor/FindTextDialog.cc                  |   9 +
 src/MacroEditor/FindTextDialog.h                   |   1 +
 src/MacroEditor/FindTextDialog.ui                  |   2 +-
 src/MacroEditor/MacroEdit.cc                       |  31 ++-
 src/MacroEditor/MacroEdit.h                        |   5 +
 src/MvApp/geo_to_grib.cc                           | 154 ++++++++++++-
 src/ObsFilter/BufrPicker.cc                        |   2 +-
 src/ObsFilter/ObsFilter.cc                         |   2 +-
 src/OgcClient/MvQOgcParam.h                        |   2 +
 src/OgcClient/MvQOgcRequest.h                      |   2 +
 src/OgcClient/MvQWmsClient.cc                      |  10 +-
 src/Percentile/Percentile.cc                       |   2 +-
 src/Scm/ObjectSpec.Scm                             |   3 +-
 src/Stations/stat.fmt                              | 247 ++++++++++----------
 src/Thermo/MTHERMOGRIDDef                          |   2 +-
 src/Thermo/MThermoDef                              |   2 +-
 src/libMetview/MvObs.cc                            |   1 +
 src/libMetview/MvRequest.cc                        |  29 ++-
 src/libMetview/MvScanFileType.cc                   |   4 +-
 src/libMvQtGui/MvQCheckBoxCombo.cc                 |   2 +-
 src/libMvQtGui/MvQKeyDialog.cc                     |   4 -
 src/libMvQtGui/MvQKeyProfileTree.cc                |   2 +-
 src/libUtil/CMakeLists.txt                         |   5 +
 src/libUtil/Grib.cc                                |   4 +-
 src/libUtil/MvAlmostObsoleteRequest.cc             |  10 +-
 src/libUtil/MvNetwork.cc                           | 249 +++++++++++++++++++++
 src/libUtil/MvNetwork.h                            |  69 ++++++
 src/libUtil/MvOdb.cc                               |   1 -
 src/libUtil/TableReader.cc                         |  23 +-
 src/libUtil/TableReader.h                          |  22 +-
 src/libUtil/proj_braz.cc                           |  46 ++--
 src/libUtil/proj_braz.hpp                          |   2 +-
 src/uPlot/MagPlusBatchService.cc                   |   2 +-
 test/data/fc_data.grib                             | Bin 0 -> 480 bytes
 test/data/gpt_to_grib_exp_mean_reference.grb       | Bin 0 -> 3240 bytes
 test/data/gpt_to_grib_exp_sum_reference.grb        | Bin 0 -> 3240 bytes
 test/data/gpt_to_grib_nearest_count_reference.grb  | Bin 0 -> 3240 bytes
 test/data/gpt_to_grib_nearest_mean_reference.grb   | Bin 0 -> 360 bytes
 test/data/gpt_to_grib_nearest_sum_reference.grb    | Bin 0 -> 360 bytes
 test/data/gpt_to_grib_reciprocal_reference.grb     | Bin 0 -> 3240 bytes
 test/data/t1000_LL_7x7.grb                         | Bin 0 -> 1560 bytes
 test/macros/CMakeLists.txt                         |  17 ++
 test/macros/HelloWorld.mv                          |   3 +-
 test/macros/gpt_to_grib_core.mv                    |  59 +++++
 test/macros/gpt_to_grib_nearest.mv                 |  74 ++++++
 test/macros/grib_dates.mv                          |  54 +++++
 test/macros/layoutx3.mv                            |   7 +-
 test/macros/plot_coast_order.mv                    |   1 +
 test/macros/set_output.mv                          |   4 +-
 161 files changed, 1601 insertions(+), 433 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