[python-cpl] 03/04: 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 f6807782c854a10a3ef640b12040a9837184909d
Merge: 556244d f51d85d
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Apr 22 13:45:54 2015 +0200

    Merge branch 'upstream' into debian

 PKG-INFO                                           |   49 +-
 README                                             |   33 -
 README.rst                                         |   42 +
 cpl/CPL_library.c                                  |    3 +
 cpl/CPL_recipe.c                                   |   21 +-
 cpl/__init__.py                                    |   22 +-
 cpl/dfs.py                                         |  289 +++---
 cpl/logger.py                                      |    2 +-
 cpl/md5sum.py                                      |    2 +-
 cpl/result.py                                      |    4 +-
 cpl/version.py                                     |    3 +-
 doc/Makefile                                       |   89 ++
 doc/conf.py                                        |  202 ++++
 doc/dfs.rst                                        |    7 +
 doc/esorex.rst                                     |   41 +
 doc/frames.rst                                     |    7 +
 doc/index.rst                                      |   52 +
 doc/install.rst                                    |   82 ++
 doc/msg.rst                                        |   81 ++
 doc/parallel.rst                                   |   77 ++
 doc/param.rst                                      |    8 +
 doc/recipe.rst                                     |  132 +++
 doc/restrictions.rst                               |   51 +
 doc/result.rst                                     |  145 +++
 doc/tutorial.rst                                   |  162 ++++
 setup.py                                           |   38 +-
 test/TestRecipe.py                                 |  931 ++++++++++++++++++
 test/iiinstrumentp/.gitignore                      |   31 +
 test/iiinstrumentp/COPYING                         |  340 +++++++
 test/iiinstrumentp/Makefile.am                     |   32 +
 test/iiinstrumentp/acinclude.m4                    |  154 +++
 test/iiinstrumentp/bootstrap                       |  546 +++++++++++
 test/iiinstrumentp/configure.ac                    |   91 ++
 test/iiinstrumentp/iiinstrument/Makefile.am        |   42 +
 test/iiinstrumentp/iiinstrument/iiinstrument_dfs.c |   93 ++
 test/iiinstrumentp/iiinstrument/iiinstrument_dfs.h |   48 +
 .../iiinstrument/iiinstrument_pfits.c              |   88 ++
 .../iiinstrument/iiinstrument_pfits.h              |   44 +
 .../iiinstrument/iiinstrument_utils.c              |   80 ++
 .../iiinstrument/iiinstrument_utils.h              |   43 +
 test/iiinstrumentp/m4macros/cpl.m4                 |  363 +++++++
 test/iiinstrumentp/m4macros/eso.m4                 | 1019 ++++++++++++++++++++
 test/iiinstrumentp/recipes/Makefile.am             |   33 +
 test/iiinstrumentp/recipes/rtest.c                 |  463 +++++++++
 44 files changed, 5867 insertions(+), 218 deletions(-)

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