[nco] 02/05: Merge tag 'upstream/4.6.1'
Bas Couwenberg
sebastic at debian.org
Sun Aug 7 11:00:50 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 51a8f09261274cc139bed51b998c1b84730f788d
Merge: 1b62cbe 6a314b1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Aug 7 12:37:27 2016 +0200
Merge tag 'upstream/4.6.1'
Upstream version 4.6.1
Conflicts:
debian/changelog
Makefile.in | 1 +
bld/nco.spec | 11 +-
bld/nco_dst.pl | 30 +-
bm/NCO_bm.pm | 7 +-
bm/NCO_rgr.pm | 45 ++-
configure | 27 +-
configure.ac | 8 +-
configure.eg | 2 +-
data/Makefile.in | 1 +
data/bsc_tst.nco | 178 ++++++++++-
data/hdf.cdl | 6 +-
data/ncclimo | 341 ++++++++++++++++++---
data/ncremap | 100 ++++--
data/vpointer-ex0.nco | 141 +++++++++
data/vpointer-ex3.nco | 61 ++++
data/vpointer-tst.nco | 29 +-
doc/ANNOUNCE | 159 +++-------
doc/ChangeLog | 158 ++++++++++
doc/MANIFEST | 25 +-
doc/Makefile.in | 1 +
doc/TODO | 7 +-
doc/VERSION | 2 +-
doc/debian.txt | 162 +++++-----
doc/highlights_old.shtml | 92 +++++-
doc/index.shtml | 365 +++++++---------------
doc/milestones_old.shtml | 2 +-
doc/nco.texi | 626 +++++++++++++++++++++++++++++++-------
doc/prs_pbl_old.shtml | 133 ++++++++
man/Makefile.in | 1 +
man/ncap.1 | 2 +-
man/ncap2.1 | 4 +-
man/ncatted.1 | 4 +-
man/ncbo.1 | 12 +-
man/ncecat.1 | 12 +-
man/nces.1 | 12 +-
man/ncflint.1 | 12 +-
man/ncks.1 | 12 +-
man/ncpdq.1 | 12 +-
man/ncra.1 | 12 +-
man/ncrcat.1 | 12 +-
man/ncrename.1 | 2 +-
man/ncwa.1 | 12 +-
src/Makefile.in | 1 +
src/nco++/Makefile.in | 1 +
src/nco++/VarOpNew.hh | 52 +++-
src/nco++/fmc_all_cls.cc | 149 +++++++--
src/nco++/fmc_all_cls.hh | 3 +-
src/nco++/map_srt_tmp.hh | 42 ++-
src/nco++/ncap2_utl.cc | 68 ++++-
src/nco++/ncoEnumTokenTypes.hpp | 2 +-
src/nco++/ncoGrammer.g | 194 +++++++-----
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 | 444 +++++++++++++--------------
src/nco++/ncoTree.hpp | 173 ++++++-----
src/nco/Makefile.am | 1 +
src/nco/Makefile.in | 2 +
src/nco/ncflint.c | 16 +-
src/nco/ncks.c | 9 +-
src/nco/nco.h | 6 +-
src/nco/nco_att_utl.c | 17 +-
src/nco/nco_cnk.c | 15 +-
src/nco/nco_ctl.c | 36 +--
src/nco/nco_fl_utl.c | 6 +-
src/nco/nco_grp_utl.c | 10 +-
src/nco/nco_netcdf.c | 2 +-
src/nco/nco_ppc.c | 8 +-
src/nco/nco_prn.c | 47 +++
src/nco/nco_rgr.c | 42 ++-
src/nco/nco_var_lst.c | 13 +-
src/nco/nco_var_utl.c | 87 +++++-
src/nco/nco_var_utl.h | 6 +
src/nco/ncra.c | 2 +-
src/nco_c++/Makefile.am | 5 +-
src/nco_c++/Makefile.in | 7 +-
78 files changed, 3020 insertions(+), 1297 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