[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 b04417d6b3cd0cd3b0aa9c86657474a5cefa94e2
Merge: fb1c4db 0fe3344
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 24 16:36:07 2015 +0200

    Merge branch 'upstream' into debian

 PKG-INFO                                           |    3 +-
 README.rst                                         |    4 +-
 doc/install.rst                                    |   13 +-
 setup.py                                           |    3 +-
 test/TestRecipe.py                                 |   24 +-
 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           |  113 ++-
 22 files changed, 99 insertions(+), 3108 deletions(-)

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