[nco] 02/05: Merge tag 'upstream/4.6.3'

[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 b0ab977f9484e55546ca5fc83a9edc2bcfa52e6e
Merge: 0f9c512 883e0ae
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 23 23:29:48 2016 +0100

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

 CMakeLists.txt            |  164 +++++++
 bld/Makefile              |   14 +
 bld/nco.spec              |   11 +-
 bld/nco_dst.pl            |   30 +-
 bm/NCO_rgr.pm             |   83 +++-
 configure                 |   20 +-
 configure.ac              |    2 +-
 configure.eg              |   21 +-
 data/in.cdl               |    2 +-
 data/in_4.cdl             |   14 +-
 data/ncclimo              | 1199 ++++++++++++++++++++++++++-------------------
 data/ncremap              |  172 ++++---
 data/{ncclimo => ncsplit} |  627 +++++++++++++-----------
 data/tst-udunits.nco      |  136 +++++
 debian/doc-base           |    2 +-
 doc/ANNOUNCE              |  182 ++++---
 doc/ChangeLog             |  147 +++++-
 doc/MANIFEST              |   12 +-
 doc/README                |    2 +-
 doc/TODO                  |    7 +-
 doc/VERSION               |    2 +-
 doc/debian.txt            |  162 +++---
 doc/highlights_old.shtml  |    2 +-
 doc/index.shtml           |  100 ++--
 doc/nco.texi              |  716 +++++++++++++++++++++------
 doc/nco_news.shtml        |   18 +-
 doc/nco_src_frg.txt       |    2 +-
 doc/xmp_cesm.html         |    2 +-
 man/ncap.1                |    4 +-
 man/ncap2.1               |    6 +-
 man/ncatted.1             |    4 +-
 man/ncbo.1                |    4 +-
 man/ncclimo.1             |   10 +-
 man/ncecat.1              |    4 +-
 man/nces.1                |    4 +-
 man/ncflint.1             |    4 +-
 man/ncks.1                |    8 +-
 man/nco.1                 |    6 +-
 man/ncpdq.1               |    4 +-
 man/ncra.1                |    4 +-
 man/ncrcat.1              |    4 +-
 man/ncremap.1             |    4 +-
 man/ncrename.1            |    6 +-
 man/ncwa.1                |    4 +-
 src/nco++/Makefile.old    |   45 +-
 src/nco++/fmc_all_cls.cc  |  423 +++++++++++-----
 src/nco++/fmc_all_cls.hh  |   11 +
 src/nco++/fmc_gsl_cls.cc  |   40 +-
 src/nco++/fmc_gsl_cls.hh  |   18 +-
 src/nco++/ncap2.cc        |   12 +-
 src/nco++/ncap2_utl.cc    |   37 ++
 src/nco++/ncap2_utl.hh    |    7 +
 src/nco++/prs_cls.cc      |   25 +-
 src/nco/Makefile.am       |    2 +
 src/nco/Makefile.in       |   14 +-
 src/nco/mpncbo.c          |    1 +
 src/nco/mpncecat.c        |    1 +
 src/nco/mpncflint.c       |    1 +
 src/nco/mpncpdq.c         |    1 +
 src/nco/mpncra.c          |    1 +
 src/nco/mpncwa.c          |    3 +-
 src/nco/ncap.c            |    1 +
 src/nco/ncap_lex.l        |    1 +
 src/nco/ncap_yacc.y       |    8 +
 src/nco/ncbo.c            |    3 +-
 src/nco/ncecat.c          |    3 +-
 src/nco/ncflint.c         |    3 +-
 src/nco/ncks.c            |   33 +-
 src/nco/nco.h             |   15 +-
 src/nco/nco_att_utl.c     |    2 +-
 src/nco/nco_cln_utl.c     |  829 +++++++++++++++++--------------
 src/nco/nco_cln_utl.h     |   95 +++-
 src/nco/nco_cnk.c         |   21 +
 src/nco/nco_cnk.h         |    1 +
 src/nco/nco_ctl.c         |    8 +-
 src/nco/nco_fl_utl.c      |    2 +-
 src/nco/nco_lmt.c         |   63 ++-
 src/nco/nco_netcdf.c      |    5 +-
 src/nco/nco_netcdf.h      |    3 +
 src/nco/nco_pck.c         |    2 +-
 src/nco/nco_prn.c         |   87 +++-
 src/nco/nco_sng_utl.h     |    7 +
 src/nco/ncpdq.c           |    3 +-
 src/nco/ncra.c            |   28 +-
 src/nco/ncwa.c            |    5 +-
 85 files changed, 3859 insertions(+), 1942 deletions(-)


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