[nco] 01/02: Merge tag 'debian/4.5.1-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jul 19 11:25:21 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 dcc62c0ea28e41d9d842197395ccb23ee02ea024
Merge: f11432e e62a884
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 19 12:50:08 2015 +0200
Merge tag 'debian/4.5.1-1' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 8 +-
Makefile.in | 59 +-
aclocal.m4 | 71 +-
bld/Makefile | 8 +-
bld/nco.spec | 14 +-
bld/nco_dst.pl | 26 +-
bm/NCO_bm.pm | 115 ++-
bm/NCO_rgr.pm | 347 +++++---
bm/nco_bm.pl | 268 +++---
configure | 78 +-
configure.ac | 47 +-
configure.eg | 13 +-
data/Makefile.in | 24 +-
data/in.cdl | 2 +-
data/in_grp_3.cdl | 6 +-
data/ncap2.in | 5 +-
debian/changelog | 7 +
debian/patches/hyphen-used-as-minus-sign.patch | 65 --
debian/patches/series | 1 -
doc/ANNOUNCE | 121 +--
doc/ChangeLog | 190 ++++
doc/MANIFEST | 1 +
doc/Makefile.in | 28 +-
doc/TODO | 4 +-
doc/VERSION | 2 +-
doc/debian.txt | 166 ++--
doc/index.shtml | 105 ++-
doc/nco.texi | 162 ++--
man/Makefile.in | 24 +-
man/ncatted.1 | 12 +-
man/ncks.1 | 2 +-
src/Makefile.in | 24 +-
src/nco++/Makefile.in | 25 +-
src/nco++/Makefile.old | 11 +-
src/nco++/fmc_all_cls.cc | 17 +-
src/nco++/fmc_all_cls.hh | 2 +-
src/nco++/ncap2.cc | 79 +-
src/nco++/ncap2_utl.cc | 864 ++++++++----------
src/nco++/prs_cls.cc | 36 +-
src/nco/Makefile.in | 30 +-
src/nco/ncatted.c | 20 +-
src/nco/ncecat.c | 2 -
src/nco/ncks.c | 21 +-
src/nco/nco.h | 12 +-
src/nco/nco_att_utl.c | 347 +++++++-
src/nco/nco_att_utl.h | 40 +-
src/nco/nco_cnk.c | 1 +
src/nco/nco_cnv_csm.c | 58 +-
src/nco/nco_ctl.c | 37 +-
src/nco/nco_ctl.h | 3 +
src/nco/nco_grp_trv.c | 4 +-
src/nco/nco_grp_utl.c | 686 +++------------
src/nco/nco_grp_utl.h | 40 -
src/nco/nco_msa.c | 135 ++-
src/nco/nco_mss_val.c | 7 +-
src/nco/nco_netcdf.c | 8 +-
src/nco/nco_netcdf.h | 4 +-
src/nco/nco_omp.c | 32 +-
src/nco/nco_ppc.c | 3 +-
src/nco/nco_prn.c | 6 -
src/nco/nco_rgr.c | 1111 ++++++++----------------
src/nco/nco_rgr.h | 71 +-
src/nco/nco_sld.c | 594 ++++++++++++-
src/nco/nco_sld.h | 49 ++
src/nco/nco_typ.h | 2 +-
src/nco/nco_var_avg.c | 7 +-
src/nco/nco_var_utl.c | 4 +-
src/nco/ncra.c | 85 +-
src/nco/ncwa.c | 2 +-
src/nco_c++/Makefile.in | 32 +-
70 files changed, 3496 insertions(+), 2996 deletions(-)
diff --cc debian/changelog
index c75d325,2dad6cd..20b3c2d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ nco (4.5.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop hyphen-used-as-minus-sign.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 14 Jul 2015 09:03:34 +0200
+
+nco (4.5.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 21 Jun 2015 12:25:58 +0200
+
nco (4.5.0-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