[nco] 01/02: Merge tag 'debian/4.5.5-1' into jessie-backports

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository nco.

commit d7b3f8b518eaf46666fe12c2798b25cb5db2ee0f
Merge: b79d252 51b942d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 5 00:12:55 2016 +0100

    Merge tag 'debian/4.5.5-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 bld/Makefile                      |   2 +-
 bld/nco.spec                      |  11 +-
 bld/nco_dst.pl                    |  30 +-
 bm/NCO_rgr.pm                     | 141 +++++-
 configure                         |  27 +-
 configure.ac                      |   6 +-
 configure.eg                      |  28 +-
 data/in.cdl                       |  13 +
 data/in_grp_8.cdl                 |  44 ++
 data/mdl_1.cdl                    |  52 ++-
 data/mdl_2.cdl                    |  24 +-
 data/ncremap                      | 507 ++++++++++++++++------
 debian/changelog                  |  11 +
 debian/control                    |   4 +-
 debian/copyright                  |   2 +-
 debian/patches/typos.patch        | 216 +++++++--
 debian/upstream/metadata          |   2 +-
 debian/watch                      |   8 +-
 doc/ANNOUNCE                      | 172 ++++----
 doc/ChangeLog                     | 191 +++++++-
 doc/TODO                          |   3 +-
 doc/VERSION                       |   2 +-
 doc/debian.txt                    | 162 +++----
 doc/index.shtml                   | 107 +++--
 doc/milestones_old.shtml          |  30 +-
 doc/nco.texi                      | 628 +++++++++++++++++++--------
 man/ncremap.1                     |   4 +
 src/nco++/Makefile.am             |   3 +
 src/nco++/Makefile.in             |   3 +
 src/nco++/fmc_all_cls.cc          | 230 +++++++++-
 src/nco++/fmc_all_cls.hh          |   3 +-
 src/nco++/ncap2_utl.cc            |  25 +-
 src/nco++/ncap2_utl.hh            |   1 +
 src/nco++/ncoEnumTokenTypes.hpp   |   9 +-
 src/nco++/ncoGrammer.g            | 288 +++++++++++-
 src/nco++/ncoLexer.cpp            |  20 +-
 src/nco++/ncoLexer.hpp            |   4 +-
 src/nco++/ncoParser.cpp           |   3 +-
 src/nco++/ncoParser.hpp           |   6 +-
 src/nco++/ncoParserTokenTypes.hpp |  13 +-
 src/nco++/ncoTree.cpp             | 892 +++++++++++++++++++++++++-------------
 src/nco++/ncoTree.hpp             |   6 +-
 src/nco++/nco_antlr_pst_prc.pl    |   3 +-
 src/nco/ESMC_CoordSys.h           |  37 --
 src/nco/ncatted.c                 |   6 +-
 src/nco/ncks.c                    |  19 +-
 src/nco/nco.h                     |  39 +-
 src/nco/nco_att_utl.c             |  20 +-
 src/nco/nco_att_utl.h             |   1 +
 src/nco/nco_cnf_typ.c             |   4 +-
 src/nco/nco_ctl.c                 |   8 +-
 src/nco/nco_fl_utl.c              |  24 +-
 src/nco/nco_grp_utl.c             | 281 +++++++-----
 src/nco/nco_grp_utl.h             |  24 +-
 src/nco/nco_lst_utl.c             |   6 +-
 src/nco/nco_msa.c                 |  24 +-
 src/nco/nco_mss_val.c             |   8 +-
 src/nco/nco_netcdf.c              |  64 ++-
 src/nco/nco_netcdf.h              |  30 +-
 src/nco/nco_ppc.c                 |  94 ++--
 src/nco/nco_ppc.h                 |   8 -
 src/nco/nco_prn.c                 |   2 +-
 src/nco/nco_prn.h                 |   1 +
 src/nco/nco_rgr.c                 | 482 +++++++++++++++++---
 src/nco/nco_rgr.h                 |  20 +
 src/nco/nco_rth_utl.c             |  36 +-
 src/nco/nco_sng_utl.c             |   4 +-
 src/nco/nco_var_avg.h             |   1 +
 src/nco/nco_var_utl.c             |   7 +-
 src/nco/ncpdq.c                   |   7 -
 src/nco/ncra.c                    |  13 +-
 src/nco/ncrename.c                |   2 +
 src/nco/ncwa.c                    |  16 +-
 73 files changed, 3805 insertions(+), 1419 deletions(-)

diff --cc debian/changelog
index 8f945e2,586008c..ac27573
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ nco (4.5.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 3.9.7, no changes.
+   * Update Vcs-Git URL to use HTTPS.
+   * Use GitHub for upstream sources.
+   * Drop typos.patch, applied upstream.
+   * Add patch for various new typos.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Feb 2016 18:19:59 +0100
+ 
 +nco (4.5.4-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 Jan 2016 22:18:44 +0100
 +
  nco (4.5.4-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index ce5c644,0c67efa..f0e7f86
--- a/debian/control
+++ b/debian/control
@@@ -19,9 -19,9 +19,9 @@@ Build-Depends: debhelper (>= 9)
                 libudunits2-dev,
                 libdap-dev,
                 texinfo
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/nco.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/nco.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/nco.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/nco.git -b jessie-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