[metview] 18/20: Merge tag 'upstream/4.7.2' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Oct 29 13:50:49 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 9e0c1c46b4f50e742564dd9005efddef1239ea07
Merge: 4e6199c 8449a61
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Oct 23 12:34:20 2016 +0100

    Merge tag 'upstream/4.7.2' into debian/master

 CMakeLists.txt                                     |   2 +-
 VERSION.cmake                                      |   2 +-
 VERSION.cmake => VERSION.cmake.orig                |   8 +-
 .../app-defaults/FrameKeyProfile_default.xml       |   4 +-
 .../app-defaults/GribKeyProfile_default.xml        |   4 +-
 .../app-defaults/LayerKeyProfile_default.xml       |   2 +-
 share/metview/etc/GeoViewDef                       |   2 +-
 share/metview/etc/{GeoViewDef => GeoViewDef.orig}  |   7 +-
 share/metview/etc/MCOASTDef                        | 176 ++++++++---------
 share/metview/etc/MarsRules                        |   9 -
 share/metview/etc/ecmwf.def                        |   9 +-
 share/metview/etc/mars.chk                         |   9 -
 share/metview/etc/tigge.def                        |  18 +-
 src/Desktop/MvQFolderModel.cc                      |  14 +-
 src/Hovmoeller/HovArea.cc                          |   3 +-
 src/Hovmoeller/HovHeight.cc                        |   3 +-
 src/Hovmoeller/HovLine.cc                          |   3 +-
 src/Hovmoeller/HovToolkit.cc                       |   9 +-
 src/Hovmoeller/MHovmoellerDataDef                  |   4 +-
 src/Hovmoeller/MHovmoellerViewDef                  |   2 +-
 src/Macro/bufr.cc                                  |   5 +
 src/Macro/grib.cc                                  |  55 +++---
 src/Macro/include/value.h                          |  57 ++++--
 src/Macro/main.cc                                  |  51 ++---
 src/Macro/request.cc                               |  19 +-
 src/Macro/value.cc                                 |   2 +-
 src/XSection/MVProfileViewDef                      |   2 +-
 src/XSection/MXAverageDef                          |   2 +-
 src/XSection/MXAverageViewDef                      |  10 +-
 src/XSection/MXSectionViewDef                      |   8 +-
 src/XSection/Xsect.cc                              |   4 +-
 src/libMetview/MvFieldSet.cc                       |   2 +-
 src/libMetview/MvRequest.cc                        |  19 +-
 src/libMetview/MvRequest.h                         |   3 +
 src/libMetview/MvScanFileType.cc                   |   3 +
 src/libMvQtGui/MvQAbstractMessageExaminer.cc       |   1 -
 src/libMvQtGui/MvQFileInfoLabel.cc                 | 218 ++++++++++-----------
 src/libMvQtUtil/CMakeLists.txt                     |   1 +
 src/libMvQtUtil/MvQFileInfo.cc                     |  61 ++++++
 src/libMvQtUtil/MvQFileInfo.h                      |  33 ++++
 src/libUtil/CMakeLists.txt                         |   3 +-
 src/libUtil/MvFileInfo.cc                          | 113 -----------
 src/libUtil/MvFileInfo.h                           |  42 ----
 src/libUtil/MvPath.cc                              |  64 +++++-
 src/libUtil/MvPath.hpp                             |   2 +
 src/uPlot/HovmoellerView.cc                        |   3 +-
 src/uPlot/MvIconDataBase.cc                        |  62 +++---
 test/data/hindcast.grib                            | Bin 0 -> 9360 bytes
 test/macros/CMakeLists.txt                         |   3 +-
 test/macros/grib_dates.mv                          |  95 +++++----
 test/macros/plot_coast_order.mv                    |   1 -
 51 files changed, 662 insertions(+), 572 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