[Debian-astro-commits] [python-cpl] 02/03: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository python-cpl.

commit 102af055adc57d8352079924d02e2ca952d56d5e
Merge: 5c96638 38774b8
Author: Ole Streicher <ole at aip.de>
Date:   Mon Feb 22 09:47:38 2016 +0100

    Merge branch 'upstream' into debian

 PKG-INFO                          |   7 +-
 README.rst                        |  16 +++--
 cpl/CPL_library.c                 |   2 +
 cpl/CPL_library.h                 |   4 +-
 cpl/cpl_api.h                     |   2 +-
 cpl/dfs.py                        |  30 ++-------
 cpl/esorex.py                     |   2 +-
 cpl/frames.py                     |   5 +-
 cpl/logger.py                     |   3 -
 cpl/md5sum.py                     |  15 ++---
 cpl/recipe.py                     |  15 +++--
 cpl/result.py                     |  47 +++++++-------
 cpl/run.py                        | 130 --------------------------------------
 cpl/version.py                    |   2 +-
 doc/install.rst                   |   9 +--
 doc/{install.rst => install.rst~} |   0
 setup.py                          |   4 +-
 test/TestRecipe.py                | 120 ++++++++++++++++++++++++-----------
 18 files changed, 157 insertions(+), 256 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-cpl.git