[cdo] 10/14: Merge branch 'debian/dfsg.1' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit 7b66d5e6d809466a1de6fd55dc36daae7bbf8395
Merge: fab0eff cfc1f65
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Dec 9 07:31:47 2017 +0000

    Merge branch 'debian/dfsg.1' into debian/master

 ChangeLog                         |   5 +
 NEWS                              |   3 +-
 cdo.spec                          |   2 +-
 configure                         |  20 +-
 configure.ac                      |   2 +-
 libcdi/ChangeLog                  |   2 +-
 libcdi/src/Makefile.in            |   2 +-
 libcdi/src/cdi.inc                |  14 +-
 src/._getMemorySize.c             | Bin 561 -> 0 bytes
 src/CMOR.cc                       |   8 +-
 src/Change_e5slm.cc               |   8 +-
 src/Consecstat.cc                 |   6 +-
 src/Copy.cc                       |   4 -
 src/Exprf.cc                      |  86 ++++++++-
 src/Fillmiss.cc                   |   4 -
 src/Remap.cc                      |   9 +-
 src/Samplegridicon.cc             |   4 -
 src/Selmulti.cc                   |   4 -
 src/Setmiss.cc                    |  35 ++--
 src/Verifygrid.cc                 | 102 +++++-----
 src/WindTrans.cc                  |   4 -
 src/YAR.cc                        |   4 -
 src/after_sptrans.cc              |   4 -
 src/after_vertint.h               |   8 -
 src/cdo.cc                        |   4 -
 src/compare.h                     |   3 +-
 src/expr.cc                       |  86 ++++++++-
 src/expr.h                        |   2 -
 src/expr_lex.cc                   | 387 +++++++++++++++++++-------------------
 src/expr_yacc.cc                  | 299 +++++++++++++++--------------
 src/expr_yacc.h                   |   4 +-
 src/grid_area.cc                  |   4 -
 src/grid_proj.h                   |  12 +-
 src/grid_search.cc                | 100 ++++++----
 src/grid_search.h                 |  12 +-
 src/modules.cc                    | 129 +++++++------
 src/nanoflann.hpp                 |   4 +-
 src/process.cc                    |   7 +-
 src/remap_conserv.cc              |   4 -
 src/remaplib.cc                   |  11 +-
 test/data/tsurf_spain_dis_off_ref | Bin 1488 -> 1488 bytes
 41 files changed, 775 insertions(+), 633 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git