[nco] 01/02: Merge tag 'debian/4.6.8-1' into stretch-backports
Bas Couwenberg
sebastic at debian.org
Tue Aug 22 06:18:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch stretch-backports
in repository nco.
commit cae0c797327bc8e209d1ed7c2800dd7544782750
Merge: 8d158db 4d602d2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 22 07:53:50 2017 +0200
Merge tag 'debian/4.6.8-1' into stretch-backports
CMakeLists.txt | 7 +
Makefile.am | 1 +
Makefile.in | 13 +-
aclocal.m4 | 50 ++---
bld/Makefile | 4 +-
bld/nco.spec | 11 +-
bld/nco_dst.pl | 30 +--
bm/NCO_bm.pm | 3 +-
bm/NCO_rgr.pm | 133 ++++++++++--
configure | 49 +++--
configure.ac | 34 ++-
configure.eg | 59 ++---
data/Makefile.am | 2 +-
data/Makefile.in | 6 +-
data/bsc_tst.nco | 32 ++-
data/buggy.cdl | 10 +-
data/clc.cdl | 2 +-
data/in.cdl | 27 ++-
data/ncclimo | 550 +++++++++++++++++++++++++++++++++++------------
data/ncremap | 147 +++++++++----
data/nsm.cdl | 4 +-
data/string.nco | 35 +++
data/tms.cdl | 73 +++++++
debian/changelog | 18 ++
debian/control | 2 +-
debian/gbp.conf | 3 +
debian/lintian-overrides | 1 -
debian/tests/control | 3 +
doc/ANNOUNCE | 205 ++++++++----------
doc/ChangeLog | 214 +++++++++++++++++-
doc/Makefile.in | 4 +-
doc/TODO | 14 +-
doc/VERSION | 2 +-
doc/debian.txt | 162 +++++++-------
doc/index.shtml | 127 ++++++-----
doc/nco.texi | 309 ++++++++++++++++++++------
man/Makefile.in | 4 +-
man/ncap.1 | 2 +-
man/ncap2.1 | 2 +-
man/ncbo.1 | 2 +-
man/ncclimo.1 | 3 +-
man/ncecat.1 | 2 +-
man/nces.1 | 2 +-
man/ncflint.1 | 2 +-
man/ncks.1 | 2 +-
man/ncpdq.1 | 2 +-
man/ncra.1 | 2 +-
man/ncrcat.1 | 2 +-
man/ncremap.1 | 5 +-
man/ncwa.1 | 2 +-
src/Makefile.in | 4 +-
src/nco++/Makefile.in | 4 +-
src/nco++/fmc_all_cls.cc | 26 ++-
src/nco++/fmc_all_cls.hh | 2 +-
src/nco++/ncap2.cc | 26 ++-
src/nco++/ncap2_att.cc | 42 ++--
src/nco++/ncap2_utl.cc | 30 ++-
src/nco++/ncap2_utl.hh | 5 +-
src/nco++/ncoGrammer.g | 34 ++-
src/nco++/ncoTree.cpp | 40 +++-
src/nco++/ncoTree.hpp | 2 +-
src/nco++/prs_cls.cc | 89 +++++++-
src/nco++/prs_cls.hh | 15 +-
src/nco/Makefile.in | 4 +-
src/nco/ncap_lex.l | 3 +-
src/nco/ncks.c | 13 +-
src/nco/nco.h | 16 +-
src/nco/nco_att_utl.c | 2 +-
src/nco/nco_cln_utl.c | 30 +--
src/nco/nco_cln_utl.h | 2 +-
src/nco/nco_cnk.c | 35 ++-
src/nco/nco_cnv_csm.c | 3 +
src/nco/nco_ctl.c | 18 +-
src/nco/nco_fl_utl.c | 2 +-
src/nco/nco_grp_utl.c | 414 ++++++++++++++++++++++++++++++-----
src/nco/nco_grp_utl.h | 24 ++-
src/nco/nco_mmr.c | 6 +-
src/nco/nco_msa.c | 96 ++++++++-
src/nco/nco_msa.h | 8 +-
src/nco/nco_mta.c | 8 +-
src/nco/nco_mta.h | 4 +
src/nco/nco_netcdf.c | 18 +-
src/nco/nco_omp.c | 2 +-
src/nco/nco_pck.c | 9 +-
src/nco/nco_prn.c | 217 ++++++-------------
src/nco/nco_prn.h | 3 -
src/nco/nco_rgr.c | 185 +++++++++++-----
src/nco/nco_rgr.h | 1 +
src/nco/nco_scm.c | 4 +-
src/nco/nco_sng_utl.c | 29 ++-
src/nco/nco_uthash.h | 14 +-
src/nco/nco_var_utl.c | 6 +-
src/nco/ncpdq.c | 2 +-
src/nco/ncra.c | 4 +-
src/nco/ncwa.c | 22 +-
src/nco_c++/Makefile.in | 4 +-
96 files changed, 2826 insertions(+), 1081 deletions(-)
diff --cc debian/changelog
index 8ee732c,dba959f..680c93a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,21 +1,28 @@@
+ nco (4.6.8-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update gbp.conf to use --no-rollback for gbp import-orig.
+ * Don't explicitly build with GCC 6, FTBFS with GCC 7 fixed upstream.
+ (closes: #853569)
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 16 Aug 2017 21:18:01 +0200
+
+ nco (4.6.7-2) unstable; urgency=medium
+
+ * Explicitly build with GCC 6 (FTBFS with GCC 7 not fixed yet).
+ * Bump Standards-Version to 4.0.0, no changes.
+ * Add autopkgtest to test installability.
+ * Drop unused lintian override.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Aug 2017 13:33:04 +0200
+
+nco (4.6.7-1~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Jul 2017 13:45:40 +0200
+
nco (4.6.7-1) unstable; urgency=medium
* Move from experimental to unstable.
diff --cc debian/control
index a9e305a,bc9dd65..87dbe8c
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
libudunits2-dev,
libdap-dev,
texinfo
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/nco.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/nco.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/nco.git -b stretch-backports
Homepage: http://nco.sourceforge.net/
Package: nco
--
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