[nco] 01/02: Merge tag 'debian/4.7.0-1' into stretch-backports

[Bas Couwenberg]

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

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

commit 08f3bcfe616cd7a2732093f3692140a5e990d442
Merge: 15769d3 bb4308a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 15 07:25:02 2017 +0100

    Merge tag 'debian/4.7.0-1' into stretch-backports

 .gitignore               |   1 +
 CMakeLists.txt           |  37 ++-
 bld/Makefile             |   7 +-
 bld/nco.spec             |  11 +-
 bld/nco_dst.pl           |  30 +-
 bm/NCO_rgr.pm            |  33 +-
 configure                |  20 +-
 configure.ac             |   2 +-
 configure.eg             |  50 ++-
 data/.gitignore          |   4 +
 data/in.cdl              |  52 ++-
 data/in_grp.cdl          |  45 +++
 data/ncclimo             |  61 +++-
 data/ncremap             |  30 +-
 debian/changelog         |  17 +-
 debian/control           |   2 +-
 doc/ANNOUNCE             | 123 ++++---
 doc/ChangeLog            | 120 +++++++
 doc/MANIFEST             |   2 +
 doc/README_msvc.txt      |  79 -----
 doc/VERSION              |   2 +-
 doc/alg_cf2_oog.png      | Bin 0 -> 195467 bytes
 doc/alg_cf2_oog.pptx     | Bin 0 -> 56888 bytes
 doc/build_hints.shtml    |   5 +-
 doc/conda.txt            |  38 +++
 doc/debian.txt           | 162 +++++-----
 doc/highlights_old.shtml |  66 +++-
 doc/index.shtml          | 205 +++++-------
 doc/logo_qt.png          | Bin 3654 -> 0 bytes
 doc/logo_vs2010.png      | Bin 4046 -> 0 bytes
 doc/milestones_old.shtml |  16 +-
 doc/nco.texi             | 393 ++++++++++++++++-------
 doc/nco_qt_msvc.shtml    |  97 ------
 man/ncclimo.1            |  17 +-
 man/ncremap.1            |   5 +-
 src/nco++/fmc_all_cls.cc |   2 +-
 src/nco/Makefile.am      |   2 +
 src/nco/Makefile.in      |  25 +-
 src/nco/libnco.h         |   1 +
 src/nco/ncatted.c        |   2 +-
 src/nco/ncflint.c        |   2 +-
 src/nco/ncks.c           |   8 +-
 src/nco/nco.h            |   8 +-
 src/nco/nco_ctl.c        |   4 +-
 src/nco/nco_fl_utl.c     |  13 +-
 src/nco/nco_grp_utl.c    |   1 -
 src/nco/nco_lmt.c        |  19 +-
 src/nco/nco_map.c        | 818 +++++++++++++++++++++++++++++++++++++++++++++++
 src/nco/nco_map.h        |  75 +++++
 src/nco/nco_mmr.c        |   2 +-
 src/nco/nco_netcdf.c     |  66 +++-
 src/nco/nco_ppc.c        |   2 +-
 src/nco/nco_rgr.c        | 202 ++++++------
 src/nco/nco_rgr.h        |  11 +-
 src/nco/nco_sld.c        |  43 ---
 src/nco/nco_sld.h        |   5 -
 src/nco/ncra.c           |  48 ++-
 src/nco/ncrename.c       |  22 +-
 src/nco/ncwa.c           |   6 +-
 59 files changed, 2218 insertions(+), 901 deletions(-)

diff --cc debian/changelog
index f8179d6,7e57dfb..e52f907
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ nco (4.7.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 4.1.1, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 09 Nov 2017 19:07:59 +0100
+ 
 +nco (4.6.9-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Sep 2017 09:23:10 +0200
 +
  nco (4.6.9-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 87dbe8c,c57d1d0..b292b21
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
                 libudunits2-dev,
                 libdap-dev,
                 texinfo
- Standards-Version: 4.0.0
+ Standards-Version: 4.1.1
  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