[nco] 02/07: Merge tag 'upstream/4.6.0'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri May 13 08:31:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nco.
commit 89029f6ece721661160fca270ca9fc69e916c67d
Merge: 6d5f1ed ea959a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri May 13 09:40:32 2016 +0200
Merge tag 'upstream/4.6.0'
Upstream version 4.6.0
Conflicts:
debian/changelog
bld/Makefile | 13 +-
bld/nco.spec | 11 +-
bld/nco_dst.pl | 30 +-
bm/NCO_bm.pm | 4 +-
bm/NCO_rgr.pm | 350 ++--
configure | 38 +-
configure.ac | 18 +-
configure.eg | 54 +-
data/Makefile.am | 11 +-
data/Makefile.in | 11 +-
data/bsc_tst.nco | 453 +++++
data/gsl_sf.in | 99 +-
data/in.cdl | 30 +-
data/in_grp_8.cdl | 72 +-
data/ncclimo | 1019 +++++++++++
data/ncremap | 326 +++-
data/vpointer-ex1.nco | 47 +
data/vpointer-ex2.nco | 91 +
data/vpointer-tst.nco | 41 +
doc/ANNOUNCE | 220 ++-
doc/ChangeLog | 331 ++++
doc/MANIFEST | 2 +
doc/TODO | 5 +-
doc/VERSION | 2 +-
doc/debian.txt | 162 +-
doc/index.shtml | 96 +-
doc/milestones_old.shtml | 9 +-
doc/nco.texi | 1138 ++++++++++--
man/Makefile.am | 2 +-
man/Makefile.in | 2 +-
man/ncap.1 | 17 +
man/ncap2.1 | 17 +
man/ncatted.1 | 25 +-
man/ncbo.1 | 2 +-
man/{ncremap.1 => ncclimo.1} | 75 +-
man/ncecat.1 | 1 +
man/nces.1 | 17 +
man/ncflint.1 | 17 +
man/ncks.1 | 1 +
man/nco.1 | 1 +
man/ncpdq.1 | 17 +
man/ncra.1 | 1 +
man/ncrcat.1 | 17 +
man/ncremap.1 | 2 +-
man/ncrename.1 | 1 +
man/ncwa.1 | 1 +
src/nco++/NcapVarVector.cc | 32 +
src/nco++/NcapVarVector.hh | 1 +
src/nco++/VarOpNew.hh | 787 +++++++++
src/nco++/fmc_all_cls.cc | 1026 +++++++++--
src/nco++/fmc_all_cls.hh | 33 +-
src/nco++/ncap2.cc | 44 +-
src/nco++/ncap2_utl.cc | 647 +++++--
src/nco++/ncap2_utl.hh | 41 +-
src/nco++/ncoEnumTokenTypes.hpp | 135 +-
src/nco++/ncoGrammer.g | 911 ++++++----
src/nco++/ncoLexer.cpp | 180 +-
src/nco++/ncoLexer.hpp | 2 +-
src/nco++/ncoParser.cpp | 714 ++++----
src/nco++/ncoParser.hpp | 9 +-
src/nco++/ncoParserTokenTypes.hpp | 135 +-
src/nco++/ncoTree.cpp | 3501 +++++++++++++++++++++++--------------
src/nco++/ncoTree.hpp | 19 +-
src/nco++/vtl_cls.hh | 15 +-
src/nco/libnco.h | 2 +-
src/nco/mpncbo.c | 8 +-
src/nco/mpncecat.c | 6 +-
src/nco/mpncflint.c | 6 +-
src/nco/mpncpdq.c | 6 +-
src/nco/mpncra.c | 8 +-
src/nco/mpncwa.c | 6 +-
src/nco/ncap.c | 6 +-
src/nco/ncap_yacc.y | 2 +-
src/nco/ncatted.c | 12 +-
src/nco/ncbo.c | 6 +-
src/nco/ncecat.c | 6 +-
src/nco/ncflint.c | 6 +-
src/nco/ncks.c | 50 +-
src/nco/nco.h | 109 +-
src/nco/nco_att_utl.c | 64 +-
src/nco/nco_att_utl.h | 3 +-
src/nco/nco_aux.c | 4 +-
src/nco/nco_bnr.c | 39 +-
src/nco/nco_bnr.h | 19 +-
src/nco/nco_cnf_dmn.c | 8 +-
src/nco/nco_cnv_csm.c | 52 +-
src/nco/nco_cnv_csm.h | 3 +-
src/nco/nco_ctl.c | 14 +-
src/nco/nco_fl_utl.c | 11 +-
src/nco/nco_fl_utl.h | 2 +-
src/nco/nco_grp_trv.c | 22 +
src/nco/nco_grp_trv.h | 5 +
src/nco/nco_grp_utl.c | 152 +-
src/nco/nco_grp_utl.h | 4 +-
src/nco/nco_mmr.c | 2 +-
src/nco/nco_msa.h | 2 +-
src/nco/nco_netcdf.c | 81 +-
src/nco/nco_netcdf.h | 2 +
src/nco/nco_omp.c | 2 +-
src/nco/nco_pck.c | 40 +-
src/nco/nco_ppc.c | 24 +-
src/nco/nco_prn.c | 17 +-
src/nco/nco_rgr.c | 1021 +++++++++--
src/nco/nco_scm.c | 21 +-
src/nco/nco_sld.c | 553 ++++++
src/nco/nco_sld.h | 26 +
src/nco/nco_sng_utl.c | 47 +
src/nco/nco_sng_utl.h | 5 +-
src/nco/nco_typ.h | 29 +
src/nco/nco_var_lst.c | 2 +
src/nco/nco_var_utl.c | 93 +-
src/nco/nco_var_utl.h | 7 +-
src/nco/ncpdq.c | 128 +-
src/nco/ncra.c | 279 ++-
src/nco/ncwa.c | 8 +-
src/nco_c++/Makefile.am | 2 +-
src/nco_c++/Makefile.in | 2 +-
src/nco_c++/Makefile.old | 2 +-
src/nco_c++/tst.cc | 2 +-
119 files changed, 12235 insertions(+), 3934 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git
More information about the Pkg-grass-devel
mailing list