[nco] 02/07: Merge tag 'upstream/4.5.3'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository nco.

commit 53e597260b8e5ef88ed0b77f7d968e9491eca5ac
Merge: 21a9424 e5438ea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 6 10:49:41 2015 +0100

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

 .gitignore                        |    4 +-
 Makefile.am                       |    2 +-
 Makefile.in                       |    2 +-
 bld/Makefile                      |   11 +-
 bld/nco.spec                      |   15 +-
 bld/nco_dst.pl                    |   26 +-
 bm/NCO_rgr.pm                     |  103 +-
 config.h.in                       |    7 +
 configure                         |  121 +-
 configure.ac                      |   61 +-
 data/pdf.nco                      |   46 +
 data/sld_nco.sh                   |  384 +++++
 data/xmp_wnd_msk.nco              |   57 +-
 doc/ANNOUNCE                      |  197 +--
 doc/ChangeLog                     |  258 +++-
 doc/MANIFEST                      |    1 +
 doc/Makefile.am                   |    3 +
 doc/Makefile.in                   |    4 +
 doc/TODO                          |    3 +-
 doc/VERSION                       |    2 +-
 doc/debian.txt                    |  162 +-
 doc/index.shtml                   |  129 +-
 doc/nces.txt                      |  105 ++
 doc/nco.texi                      |  360 +++--
 man/ncpdq.1                       |    2 +-
 src/nco++/fmc_all_cls.cc          |  221 +++
 src/nco++/fmc_all_cls.hh          |   14 +
 src/nco++/map_srt_tmp.hh          |   76 +
 src/nco++/ncap2.cc                |    4 +
 src/nco++/ncap2_utl.cc            |  144 +-
 src/nco++/ncoGrammer.g            |  152 +-
 src/nco++/ncoLexer.cpp            |    2 +-
 src/nco++/ncoLexer.hpp            |    2 +-
 src/nco++/ncoParser.cpp           |    2 +-
 src/nco++/ncoParser.hpp           |    2 +-
 src/nco++/ncoParserTokenTypes.hpp |    2 +-
 src/nco++/ncoTree.cpp             |  335 ++--
 src/nco++/ncoTree.hpp             |  118 +-
 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                  |    1 +
 src/nco/ncap.c                    |    1 +
 src/nco/ncatted.c                 |    1 +
 src/nco/ncbo.c                    |    1 +
 src/nco/ncecat.c                  |    5 +-
 src/nco/ncflint.c                 |    1 +
 src/nco/ncks.c                    |   21 +-
 src/nco/nco.h                     |   25 +-
 src/nco/nco_att_utl.c             |  158 +-
 src/nco/nco_aux.c                 |   39 +-
 src/nco/nco_aux.h                 |    8 +-
 src/nco/nco_cnf_dmn.c             |    8 +-
 src/nco/nco_cnf_typ.c             |   43 +-
 src/nco/nco_cnf_typ.h             |    4 +
 src/nco/nco_ctl.c                 |    9 +-
 src/nco/nco_dmn_utl.c             |   11 +-
 src/nco/nco_fl_utl.c              |    9 +-
 src/nco/nco_fl_utl.h              |    1 +
 src/nco/nco_grp_utl.c             |   62 +-
 src/nco/nco_rgr.c                 | 3084 ++++++++++++++++++++++++++++++-------
 src/nco/nco_rgr.h                 |   16 +-
 src/nco/ncpdq.c                   |   18 +-
 src/nco/ncra.c                    |    5 +-
 src/nco/ncrename.c                |    1 +
 src/nco/ncwa.c                    |    1 +
 src/nco_c++/Makefile.am           |    1 +
 src/nco_c++/Makefile.in           |    1 +
 70 files changed, 5292 insertions(+), 1387 deletions(-)

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