[nco] 01/02: Merge tag 'debian/4.5.3-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Nov 23 20:34:14 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 c8ef87ac28db6ee2bde3b606a6dbc9247ccb23c6
Merge: 8cd2ee7 b704468
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Nov 23 21:24:34 2015 +0100
Merge tag 'debian/4.5.3-1' into jessie-backports
Conflicts:
debian/changelog
.gitignore | 4 +-
Makefile.am | 2 +-
Makefile.in | 2 +-
bld/Makefile | 11 +-
bld/nco.spec | 15 +-
bld/nco_dst.pl | 26 +-
bm/NCO_rgr.pm | 103 +-
config.h.in | 7 +
configure | 121 +-
configure.ac | 61 +-
data/pdf.nco | 46 +
data/sld_nco.sh | 384 +++++
data/xmp_wnd_msk.nco | 57 +-
debian/changelog | 9 +
debian/control | 2 +-
debian/convert | 68 -
debian/patches/gsl-2.0.patch | 187 +++
debian/patches/series | 1 +
doc/ANNOUNCE | 197 +--
doc/ChangeLog | 258 +++-
doc/MANIFEST | 1 +
doc/Makefile.am | 3 +
doc/Makefile.in | 4 +
doc/TODO | 3 +-
doc/VERSION | 2 +-
doc/debian.txt | 162 +-
doc/index.shtml | 129 +-
doc/nces.txt | 105 ++
doc/nco.texi | 360 +++--
man/ncpdq.1 | 2 +-
src/nco++/fmc_all_cls.cc | 221 +++
src/nco++/fmc_all_cls.hh | 14 +
src/nco++/map_srt_tmp.hh | 76 +
src/nco++/ncap2.cc | 4 +
src/nco++/ncap2_utl.cc | 144 +-
src/nco++/ncoGrammer.g | 152 +-
src/nco++/ncoLexer.cpp | 2 +-
src/nco++/ncoLexer.hpp | 2 +-
src/nco++/ncoParser.cpp | 2 +-
src/nco++/ncoParser.hpp | 2 +-
src/nco++/ncoParserTokenTypes.hpp | 2 +-
src/nco++/ncoTree.cpp | 335 ++--
src/nco++/ncoTree.hpp | 118 +-
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 | 1 +
src/nco/ncap.c | 1 +
src/nco/ncatted.c | 1 +
src/nco/ncbo.c | 1 +
src/nco/ncecat.c | 5 +-
src/nco/ncflint.c | 1 +
src/nco/ncks.c | 21 +-
src/nco/nco.h | 25 +-
src/nco/nco_att_utl.c | 158 +-
src/nco/nco_aux.c | 39 +-
src/nco/nco_aux.h | 8 +-
src/nco/nco_cnf_dmn.c | 8 +-
src/nco/nco_cnf_typ.c | 43 +-
src/nco/nco_cnf_typ.h | 4 +
src/nco/nco_ctl.c | 9 +-
src/nco/nco_dmn_utl.c | 11 +-
src/nco/nco_fl_utl.c | 9 +-
src/nco/nco_fl_utl.h | 1 +
src/nco/nco_grp_utl.c | 62 +-
src/nco/nco_rgr.c | 3084 ++++++++++++++++++++++++++++++-------
src/nco/nco_rgr.h | 16 +-
src/nco/ncpdq.c | 18 +-
src/nco/ncra.c | 5 +-
src/nco/ncrename.c | 1 +
src/nco/ncwa.c | 1 +
src/nco_c++/Makefile.am | 1 +
src/nco_c++/Makefile.in | 1 +
75 files changed, 5490 insertions(+), 1456 deletions(-)
diff --cc debian/changelog
index d5e28c2,2e11165..bbade90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ nco (4.5.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop obsolete convert script.
+ * Update libgsl-dev build dependendency for gsl 2.0.
+ * Add patch for GSL 2.0 support.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 06 Nov 2015 11:02:23 +0100
+
+nco (4.5.2-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 17 Sep 2015 19:29:38 +0200
+
nco (4.5.2-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