[nco] 01/02: Merge tag 'debian/4.6.3-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Tue Jan 3 07:14:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository nco.
commit 7df3b7fa4515b4cfa463afc66cb0a3ca3e9669d8
Merge: 8f00051 79735bf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jan 3 08:01:00 2017 +0100
Merge tag 'debian/4.6.3-1' into jessie-backports
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/changelog | 8 +
debian/doc-base | 2 +-
debian/patches/series | 1 -
debian/patches/spelling-errors.patch | 55 --
debian/rules | 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 +-
89 files changed, 3868 insertions(+), 1999 deletions(-)
diff --cc debian/changelog
index 26b7b29,bb16c8a..f4734a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ nco (4.6.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop patches, applied upstream.
+ * Don't limit parallel build, FTBFS fixed with BUILT_SOURCES patch.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Dec 2016 23:34:40 +0100
+
+nco (4.6.2-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Change GSL dependency to libgsl0-dev for jessie.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2016 09:15:07 +0100
+
nco (4.6.2-2) unstable; urgency=medium
* Limit parallel build (max-parallel=32).
--
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