[cmor] 02/05: Merge tag 'upstream/3.2.7' 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 cmor.

commit bbc6ba0aca683343d45075a1fad49cf71ea7903c
Merge: d7de6b3 8d2a98b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 18 10:06:25 2017 +0100

    Merge tag 'upstream/3.2.7' into debian/master

 INSTALL                            |  4 +--
 Lib/pywrapper.py                   | 23 ++++++++-----
 Makefile.in                        |  6 ++--
 README.md                          |  2 +-
 RELEASE-NOTES                      |  1 +
 Src/cmor.c                         | 14 ++++----
 Test/test_python_joerg_4.py        |  2 +-
 configure                          | 18 +++++-----
 configure.ac                       |  2 +-
 include/cmor.h                     |  2 +-
 include/cmor_locale.h              |  2 +-
 recipes/cmor/build.sh              | 32 ++++++++++++++++++
 recipes/cmor/meta.yaml             | 33 ++++++++++++++++++
 recipes/cmor/meta.yaml.in          | 40 ++++++++++++++++++++++
 recipes/cmor/scripts/activate.sh   | 10 ++++++
 recipes/cmor/scripts/deactivate.sh |  9 +++++
 recipes/conda-envs/cmor.yml        | 69 ++++++++++++++++++++++++++++++++++++++
 17 files changed, 235 insertions(+), 34 deletions(-)

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