[python-pyraf] 02/04: Merge branch 'upstream' into debian

[Ole Streicher]

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

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

commit c9782cdb1577c53db79821514ea0012186d8d000
Merge: 544bf81 e9519c6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 31 18:02:03 2014 +0100

    Merge branch 'upstream' into debian

 PKG-INFO                                           |   2 +-
 lib/pyraf.egg-info/PKG-INFO                        |   2 +-
 lib/pyraf.egg-info/SOURCES.txt                     |   1 +
 lib/pyraf/ipython_api.py                           |  43 +++++++----
 lib/pyraf/irafpar.py                               |  81 +++++++++++++++------
 lib/pyraf/version.py                               |  20 ++---
 lib/pyraf/version.py.orig1                         |  16 ++--
 lib/pyraf/version.py.orig2                         |  16 ++--
 lib/pyraf/wutil.py                                 |  62 ++++++++++------
 lib/pyraf_setup.py                                 |  11 ---
 lib/pyraf_setup.pyc                                | Bin 3635 -> 3295 bytes
 required_pkgs/d2to1/.authors                       |   1 +
 required_pkgs/d2to1/CHANGES.rst                    |  14 +++-
 required_pkgs/d2to1/d2to1/util.py                  |   2 +-
 required_pkgs/d2to1/d2to1/zestreleaser.py          |  26 ++++---
 required_pkgs/d2to1/setup.cfg                      |   2 +-
 required_pkgs/d2to1/tox.ini                        |  11 +++
 required_pkgs/stsci.distutils/CHANGES.txt          |  26 ++++++-
 required_pkgs/stsci.distutils/setup.cfg            |   4 +-
 .../stsci.distutils/stsci/distutils/astutils.py    |  44 ++++++-----
 .../stsci.distutils/stsci/distutils/hooks.py       |   3 +-
 .../stsci.distutils/stsci/distutils/release.py     |   3 +
 .../stsci/distutils/tests/test_hooks.py            |   6 +-
 .../stsci/distutils/versionutils.py                |  10 ++-
 .../stsci.tools/lib/stsci/tools/__init__.py        |   3 +-
 .../stsci.tools/lib/stsci/tools/capable.py         |  35 +++++++--
 .../stsci.tools/lib/stsci/tools/eparoption.py      |  32 +++++++-
 .../stsci.tools/lib/stsci/tools/filedlg.py         |   3 +-
 .../stsci.tools/lib/stsci/tools/fileutil.py        |  18 ++---
 .../stsci.tools/lib/stsci/tools/tester.py          |  14 ++--
 .../lib/stsci/tools/tests/testStpyfits.py          |  18 ++---
 required_pkgs/stsci.tools/setup.cfg                |   2 +-
 required_pkgs/stsci.tools/setup.cfg.orig           |   2 +-
 scripts/pyraf                                      |  10 ++-
 setup.cfg                                          |   5 +-
 tools/createTarBall.csh                            |   8 +-
 36 files changed, 371 insertions(+), 185 deletions(-)

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