This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository nco.
commit a0b51c41242da9e3383ed081376f95beedb3e055 Merge: 2edbc6a 9ed1021 Author: Bas Couwenberg <[email protected]> Date: Fri Nov 25 09:15:03 2016 +0100 Merge tag 'debian/4.6.2-2' into jessie-backports Conflicts: debian/changelog bld/Makefile | 17 +- bld/nco.spec | 11 +- bld/nco_dst.pl | 30 +- bm/NCO_rgr.pm | 80 +- config.h.in | 6 + configure | 41 +- configure.ac | 9 +- configure.eg | 6 +- data/bsc_tst.nco | 2 +- data/in.cdl | 14 + data/in_4.cdl | 15 +- data/in_grp.cdl | 4 +- data/ncap.in | 2 +- data/ncclimo | 36 +- data/ncremap | 47 +- debian/changelog | 16 + debian/control | 2 +- debian/patches/spelling-errors.patch | 71 +- debian/rules | 2 +- doc/ANNOUNCE | 164 ++-- doc/ChangeLog | 235 ++++- doc/MANIFEST | 2 + doc/README_msvc.txt | 2 +- doc/TODO | 10 +- doc/VERSION | 2 +- doc/debian.txt | 162 ++-- doc/index.shtml | 83 +- doc/nco.texi | 1236 ++++++++++++++++++++++----- doc/nco_qt_msvc.shtml | 2 +- man/ncclimo.1 | 10 +- man/ncflint.1 | 2 +- man/ncremap.1 | 8 +- qt/libnco/libnco.pro | 6 +- qt/libnco/libnco.vcxproj | 83 +- qt/libnco/libnco.vcxproj.filters | 295 +++++++ qt/libnco_c++/libnco_c++.vcxproj | 81 +- qt/libnco_c++/libnco_c++.vcxproj.filters | 64 ++ qt/ncap2/ncap2.vcxproj | 91 +- qt/ncap2/ncap2.vcxproj.filters | 127 +++ qt/ncatted/ncatted.vcxproj | 91 +- qt/ncatted/ncatted.vcxproj.filters | 18 + qt/ncbo/ncbo.vcxproj | 91 +- qt/ncbo/ncbo.vcxproj.filters | 18 + qt/ncea/ncea.vcxproj | 91 +- qt/ncea/ncea.vcxproj.filters | 18 + qt/ncecat/ncecat.vcxproj | 91 +- qt/ncecat/ncecat.vcxproj.filters | 18 + qt/ncflint/ncflint.vcxproj | 91 +- qt/ncflint/ncflint.vcxproj.filters | 18 + qt/ncks/ncks.vcxproj | 91 +- qt/ncks/ncks.vcxproj.filters | 18 + qt/nco.pri | 4 + qt/nco.sln | 10 +- qt/ncpdq/ncpdq.vcxproj | 91 +- qt/ncpdq/ncpdq.vcxproj.filters | 18 + qt/ncra/ncra.vcxproj | 91 +- qt/ncra/ncra.vcxproj.filters | 18 + qt/ncrcat/ncrcat.vcxproj | 91 +- qt/ncrcat/ncrcat.vcxproj.filters | 18 + qt/ncrename/ncrename.vcxproj | 91 +- qt/ncrename/ncrename.vcxproj.filters | 18 + qt/ncwa/ncwa.vcxproj | 91 +- qt/ncwa/ncwa.vcxproj.filters | 18 + qt/tst_nco_c++/tst_nco_c++.vcxproj | 91 +- qt/tst_nco_c++/tst_nco_c++.vcxproj.filters | 18 + src/nco++/fmc_all_cls.cc | 4 +- src/nco++/fmc_gsl_cls.cc | 2 +- src/nco++/ncap2_utl.cc | 37 + src/nco++/ncap2_utl.hh | 4 + src/nco++/ncoGrammer.g | 195 ++++- src/nco++/ncoLexer.cpp | 100 ++- src/nco++/ncoLexer.hpp | 19 +- src/nco++/ncoParser.cpp | 2 +- src/nco++/ncoParser.hpp | 2 +- src/nco++/ncoParserTokenTypes.hpp | 2 +- src/nco++/ncoTree.cpp | 536 ++++++++---- src/nco++/ncoTree.hpp | 8 +- src/nco/Makefile.am | 2 + src/nco/Makefile.in | 43 +- src/nco/libnco.h | 1 + src/nco/ncks.c | 40 +- src/nco/nco.h | 25 +- src/nco/nco_att_utl.c | 59 +- src/nco/nco_att_utl.h | 1 + src/nco/nco_aux.c | 7 +- src/nco/nco_cnv_csm.c | 2 +- src/nco/nco_ctl.c | 14 +- src/nco/nco_dmn_utl.c | 1 + src/nco/nco_grp_utl.c | 299 +++---- src/nco/nco_lst_utl.c | 7 +- src/nco/nco_mmr.c | 3 +- src/nco/nco_msa.c | 87 +- src/nco/nco_mta.c | 253 ++++++ src/nco/nco_mta.h | 83 ++ src/nco/nco_netcdf.c | 37 + src/nco/nco_netcdf.h | 8 +- src/nco/nco_omp.c | 2 +- src/nco/nco_ppc.c | 66 +- src/nco/nco_ppc.h | 1 + src/nco/nco_prn.c | 1281 ++++++++++++++++++++++++++-- src/nco/nco_prn.h | 24 + src/nco/nco_rgr.c | 287 +++++-- src/nco/nco_rgr.h | 7 +- src/nco/nco_sld.c | 53 +- src/nco/nco_sng_utl.c | 200 +++-- src/nco/nco_sng_utl.h | 34 +- src/nco/nco_var_lst.c | 6 +- src/nco/nco_var_utl.c | 4 +- src/nco/ncra.c | 7 +- src/nco/ncwa.c | 53 +- 110 files changed, 6241 insertions(+), 2065 deletions(-) diff --cc debian/changelog index 1643b21,3c8cd78..6ba2604 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,19 +1,25 @@@ + nco (4.6.2-2) unstable; urgency=medium + + * Limit parallel build (max-parallel=32). + (closes: #844865) + + -- Bas Couwenberg <[email protected]> Sat, 19 Nov 2016 11:33:54 +0100 + + nco (4.6.2-1) unstable; urgency=medium + + * New upstream release. + * Drop libgsl0-dev alternative dependency. + * Drop spelling-errors.patch, applied upstream. + * Add patch to fix spelling errors. + + -- Bas Couwenberg <[email protected]> Wed, 16 Nov 2016 19:09:35 +0100 + +nco (4.6.1-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Sun, 14 Aug 2016 12:16:23 +0200 + nco (4.6.1-1) unstable; urgency=medium * New upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
