[python-pyraf] 01/02: Merge tag 'upstream/2.1.7' 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-pyraf.

commit dbc36bf652f45c80b48a365d5714b4b012387328
Merge: 9caf52a 2fea6e4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 5 14:15:35 2015 +0200

    Merge tag 'upstream/2.1.7' into debian
    
    Upstream version 2.1.7

 PKG-INFO                                           |   2 +-
 TEST_COMMIT                                        |   4 +-
 lib/pyraf.egg-info/PKG-INFO                        |   2 +-
 lib/pyraf.egg-info/SOURCES.txt                     |   4 +-
 lib/pyraf/__init__.py                              |  21 +-
 lib/pyraf/cl2py.py                                 |   8 +-
 lib/pyraf/clcache.py                               |  10 +-
 lib/pyraf/gki_psikern_tests.py                     |  24 +-
 lib/pyraf/irafcompleter.py                         |   6 +-
 lib/pyraf/iraffunctions.py                         |  25 +-
 lib/pyraf/irafpar.py                               |  61 +-
 lib/pyraf/iraftask.py                              |  14 +-
 lib/pyraf/pycmdline.py                             |   3 +-
 lib/pyraf/version.py                               |   8 +-
 lib/pyraf/version.py.orig1                         |   4 +-
 lib/pyraf/version.py.orig2                         |   4 +-
 lib/pyraf_setup.pyc                                | Bin 3295 -> 3295 bytes
 required_pkgs/d2to1/.travis.yml                    |   1 -
 required_pkgs/d2to1/README.rst                     |   4 +-
 required_pkgs/d2to1/setup.cfg                      |  28 +-
 required_pkgs/stsci.tools/defsetup.py              |  25 -
 required_pkgs/stsci.tools/distribute_setup.py      | 485 -------------
 .../stsci.tools/doc/source/teal_guide.rst          | 161 +++--
 required_pkgs/stsci.tools/ez_setup.py              | 332 +++++++++
 .../stsci.tools/lib/stsci/tools/asnutil.py         |  86 +--
 .../stsci.tools/lib/stsci/tools/capable.py         |  30 +-
 .../stsci.tools/lib/stsci/tools/check_files.py     |  39 +-
 .../stsci.tools/lib/stsci/tools/compmixin.py       |   2 +-
 .../stsci.tools/lib/stsci/tools/convertgeis.py     | 106 +--
 .../lib/stsci/tools/convertwaiveredfits.py         |  75 +-
 .../stsci.tools/lib/stsci/tools/fileutil.py        | 761 ++++++++++++---------
 .../stsci.tools/lib/stsci/tools/fitsdiff.py        |   9 +-
 .../stsci.tools/lib/stsci/tools/irafglobals.py     |   4 +-
 .../stsci.tools/lib/stsci/tools/irafutils.py       |  18 +-
 .../stsci.tools/lib/stsci/tools/iterfile.py        |  22 +-
 .../stsci.tools/lib/stsci/tools/logutil.py         |   3 +-
 .../stsci.tools/lib/stsci/tools/mputil.py          |  72 +-
 .../stsci.tools/lib/stsci/tools/nimageiter.py      |   2 -
 .../stsci.tools/lib/stsci/tools/readgeis.py        |  83 ++-
 .../stsci.tools/lib/stsci/tools/stpyfits.py        |  98 ++-
 .../stsci.tools/lib/stsci/tools/swapgeis.py        |  72 +-
 .../stsci.tools/lib/stsci/tools/teal_bttn.py       |   2 +-
 .../lib/stsci/tools/tests/testStpyfits.py          | 134 ++--
 .../stsci.tools/lib/stsci/tools/textutil.py        |  18 +-
 .../stsci.tools/lib/stsci/tools/wcsutil.py         |  35 +-
 required_pkgs/stsci.tools/old_stsci/__init__.py    |   1 -
 required_pkgs/stsci.tools/setup.cfg                |  17 +-
 required_pkgs/stsci.tools/setup.cfg.orig           |  19 +-
 required_pkgs/stsci.tools/setup.py                 |   7 +-
 setup.cfg                                          |   2 +-
 tools/createTarBall.csh                            |  13 +-
 51 files changed, 1537 insertions(+), 1429 deletions(-)

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