[metview] 01/08: Merge tag 'upstream/4.8.6' 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 metview.

commit de5981fdde0570e3490db79e59c4c6ca8db7809b
Merge: 467f88d a71c3bb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jun 20 06:38:22 2017 +0100

    Merge tag 'upstream/4.8.6' into debian/master

 VERSION.cmake                        |   2 +-
 VERSION.cmake.orig                   |  11 -
 scripts/mv_vapor_prep.mv             |  83 +++-
 share/metview/etc/MCONTDef.orig      | 707 -----------------------------------
 share/metview/etc/MarsRules          |   1 +
 share/metview/etc/ecmwf.def          |   3 +-
 share/metview/etc/mars.chk           |   1 +
 share/metview/etc/reportypes.def     |   7 +
 share/metview/etc/rt_by_obsgroup.chk |   4 +-
 src/Vapor/VaporPrepare.cc            |   2 +-
 src/libMars/CMakeLists.txt.orig      | 213 -----------
 src/libMarsClient/CMakeLists.txt     |   7 +
 src/libMarsClient/authenticate.c     |   3 +
 src/libMarsClient/environ.c          |   2 +-
 src/libMarsClient/fdb5base.cc        |  16 +
 src/libMarsClient/handler.c          |   2 +-
 src/libUtil/MvFlextra.cc             |  40 +-
 test/macros/plot_coast_order.mv      |   1 -
 18 files changed, 144 insertions(+), 961 deletions(-)

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