[nco] 02/04: Merge tag 'upstream/4.6.5'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository nco.

commit dcbeeebb84f6e2feb77d119c9d80a0e1b6a08644
Merge: 45fc729 6e08b94
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 16 07:29:51 2017 +0100

    Merge tag 'upstream/4.6.5'
    
    Upstream version 4.6.5
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt           |  31 ++-
 bld/nco.spec             |  11 +-
 bld/nco_dst.pl           |  30 +--
 bm/NCO_rgr.pm            |   5 +-
 configure                |  20 +-
 configure.ac             |   2 +-
 configure.eg             |   6 +-
 data/bsc_tst.nco         |   9 +
 data/in.cdl              |  15 +-
 data/ncclimo             |  45 +++-
 data/ncremap             | 198 ++++++++++-----
 data/stdin.sh            |  45 ++++
 data/stdin_tst.sh        |  15 ++
 data/tst-udunits.nco     |  26 +-
 data/vpointer-ex3.nco    |  16 ++
 doc/ANNOUNCE             | 154 +++++++-----
 doc/ChangeLog            | 125 ++++++++++
 doc/TODO                 |   2 +-
 doc/VERSION              |   2 +-
 doc/debian.txt           | 162 ++++++-------
 doc/index.shtml          |  91 +++----
 doc/nco.texi             | 243 +++++++++++++++----
 man/ncbo.1               |   1 +
 man/ncclimo.1            |   8 +-
 man/ncecat.1             |   1 +
 man/nces.1               |   1 +
 man/ncflint.1            |   1 +
 man/ncks.1               |   2 +-
 man/ncpdq.1              |   1 +
 man/ncra.1               |   1 +
 man/ncrcat.1             |   1 +
 man/ncremap.1            |   3 +-
 man/ncwa.1               |   1 +
 src/nco++/fmc_all_cls.cc | 372 ++++++++++++++++++++++++-----
 src/nco++/fmc_all_cls.hh |   7 +-
 src/nco++/ncap2.cc       |  37 ++-
 src/nco++/ncap2_att.cc   |  76 +++++-
 src/nco++/ncap2_att.hh   |  12 +
 src/nco++/ncap2_utl.cc   |  63 ++---
 src/nco++/ncoGrammer.g   | 153 ++++++++----
 src/nco++/ncoTree.cpp    | 450 +++++++++++++++++++---------------
 src/nco/mpncbo.c         |  13 +-
 src/nco/mpncecat.c       |  13 +-
 src/nco/mpncflint.c      |  13 +-
 src/nco/mpncpdq.c        |  10 +-
 src/nco/mpncra.c         |  13 +-
 src/nco/mpncwa.c         |  13 +-
 src/nco/ncap.c           |  11 +-
 src/nco/ncatted.c        |  13 +-
 src/nco/ncbo.c           |  33 ++-
 src/nco/ncecat.c         |  33 ++-
 src/nco/ncflint.c        |  33 ++-
 src/nco/ncks.c           |  60 +++--
 src/nco/nco.h            |   5 +-
 src/nco/nco_att_utl.c    |   6 +-
 src/nco/nco_cln_utl.c    | 367 +++++++++++++++++++++++++---
 src/nco/nco_cln_utl.h    |  80 +++++--
 src/nco/nco_cnk.c        |  30 +++
 src/nco/nco_cnk.h        |   4 +
 src/nco/nco_ctl.c        |  26 +-
 src/nco/nco_fl_utl.c     |  15 +-
 src/nco/nco_lst_utl.c    |   2 +-
 src/nco/nco_msa.c        |  18 +-
 src/nco/nco_mss_val.c    |  16 +-
 src/nco/nco_mss_val.h    |   4 +-
 src/nco/nco_netcdf.c     |   2 +-
 src/nco/nco_ppc.c        |   5 +-
 src/nco/nco_prn.c        | 610 +++++++++++++++++++++++++++++------------------
 src/nco/nco_prn.h        |   5 +
 src/nco/nco_rgr.c        | 224 ++++++++---------
 src/nco/nco_sld.c        |   6 +-
 src/nco/nco_sng_utl.c    |   5 +-
 src/nco/nco_sng_utl.h    |   1 +
 src/nco/ncpdq.c          |  37 ++-
 src/nco/ncra.c           |  33 ++-
 src/nco/ncrename.c       |  13 +-
 src/nco/ncwa.c           |  33 ++-
 77 files changed, 2926 insertions(+), 1323 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git