[nco] 01/02: Merge tag 'debian/4.5.2-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Sep 17 17:53:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository nco.
commit 8c2176cf47ccf05d3b107f56c00b3b8df6037097
Merge: 61cb7cf 21a9424
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Sep 17 19:29:34 2015 +0200
Merge tag 'debian/4.5.2-1' into jessie-backports
Conflicts:
debian/changelog
bld/Makefile | 22 +-
bld/nco.spec | 4 +-
bm/NCO_rgr.pm | 136 ++++-
configure | 20 +-
configure.ac | 2 +-
configure.eg | 78 ++-
debian/changelog | 16 +
debian/upstream/metadata | 4 +-
debian/watch | 2 +
doc/ANNOUNCE | 142 ++---
doc/ChangeLog | 228 ++++++-
doc/TODO | 3 +-
doc/VERSION | 2 +-
doc/index.shtml | 76 ++-
doc/nco.texi | 429 +++++++++++--
man/ncap.1 | 3 +
man/ncap2.1 | 3 +
man/ncatted.1 | 3 +
man/ncbo.1 | 3 +
man/ncdiff.1 | 3 +
man/ncea.1 | 5 +-
man/ncecat.1 | 3 +
man/nces.1 | 2 +-
man/ncflint.1 | 3 +
man/ncks.1 | 15 +-
man/ncpdq.1 | 3 +
man/ncra.1 | 5 +-
man/ncrcat.1 | 3 +
man/ncrename.1 | 6 +-
man/ncwa.1 | 3 +
src/nco++/ncap2.cc | 260 ++++----
src/nco++/ncoGrammer.g | 5 +
src/nco++/ncoTree.cpp | 207 +++----
src/nco/mpncbo.c | 217 +++----
src/nco/mpncecat.c | 221 +++----
src/nco/mpncflint.c | 217 +++----
src/nco/mpncpdq.c | 214 +++----
src/nco/mpncra.c | 50 +-
src/nco/mpncwa.c | 278 ++++-----
src/nco/ncap.c | 214 +++----
src/nco/ncatted.c | 31 +-
src/nco/ncbo.c | 202 ++++---
src/nco/ncecat.c | 221 +++----
src/nco/ncflint.c | 210 +++----
src/nco/ncks.c | 487 +++++++--------
src/nco/nco.h | 50 +-
src/nco/nco_att_utl.c | 62 ++
src/nco/nco_att_utl.h | 6 +
src/nco/nco_cnf_typ.c | 2 +-
src/nco/nco_cnv_csm.c | 2 +-
src/nco/nco_ctl.c | 36 +-
src/nco/nco_fl_utl.c | 54 +-
src/nco/nco_grp_utl.c | 10 +-
src/nco/nco_mmr.c | 6 +-
src/nco/nco_rgr.c | 1506 ++++++++++++++++++++++++++++++++++++++++------
src/nco/nco_rgr.h | 36 +-
src/nco/nco_rth_utl.c | 10 +-
src/nco/nco_scm.c | 2 +-
src/nco/nco_sld.c | 453 +++++++++++++-
src/nco/nco_sld.h | 8 +
src/nco/nco_var_rth.c | 113 +++-
src/nco/nco_var_rth.h | 12 +
src/nco/nco_var_utl.c | 7 +
src/nco/ncpdq.c | 55 +-
src/nco/ncra.c | 306 +++++-----
src/nco/ncrename.c | 28 +-
src/nco/ncwa.c | 74 ++-
67 files changed, 4999 insertions(+), 2100 deletions(-)
diff --cc debian/changelog
index c1df6af,8ca44a2..232c225
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ nco (4.5.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update upstream metadata for GitHub repo move.
+ * Drop typo patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 11 Sep 2015 12:27:29 +0200
+
+ nco (4.5.1-2) unstable; urgency=medium
+
+ * Handle common dversion mangling in watch file.
+ * Add patch for 'unofficial' typo.
+ * Rebuild for netcdf transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 24 Aug 2015 14:44:04 +0200
+
+nco (4.5.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 19 Jul 2015 12:50:27 +0200
+
nco (4.5.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
More information about the Pkg-grass-devel
mailing list