[python-pyraf] 01/02: 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 344967e1b1a056bfc7ac5de286f54ce31a058c23
Merge: 06e98f5 93dec89
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Aug 21 13:59:02 2013 +0200

    Merge branch 'upstream' into debian

 MANIFEST.in                                        |    3 +-
 PKG-INFO                                           |   30 +
 data/{PyRAF.exe => PyRAF_exe.was}                  |  Bin 90326 -> 90326 bytes
 lib/pyraf.egg-info/PKG-INFO                        |   30 +
 lib/pyraf.egg-info/SOURCES.txt                     |  917 ++++++++++++++++++++
 lib/pyraf.egg-info/dependency_links.txt            |    1 +
 lib/pyraf.egg-info/not-zip-safe                    |    1 +
 lib/pyraf.egg-info/requires.txt                    |    1 +
 lib/pyraf.egg-info/top_level.txt                   |    1 +
 lib/pyraf/__init__.py                              |    9 +-
 lib/pyraf/aqutil.py                                |    7 +-
 lib/pyraf/gki_psikern_tests.py                     |   20 +-
 lib/pyraf/irafexecute.py                           |   43 +-
 lib/pyraf/iraffunctions.py                         |   19 +-
 lib/pyraf/irafpar.py                               |   15 +-
 lib/pyraf/svninfo.py                               |    3 -
 lib/pyraf/version.py                               |   81 ++
 lib/pyraf/version.py.orig1                         |   81 ++
 lib/pyraf/version.py.orig2                         |   81 ++
 lib/pyraf/wutil.py                                 |   83 +-
 lib/pyraf_setup.pyc                                |  Bin 0 -> 3635 bytes
 required_pkgs/d2to1/CHANGES.rst                    |    5 +-
 required_pkgs/d2to1/distribute_setup.py            |  515 -----------
 required_pkgs/d2to1/ez_setup.py                    |  264 ++++++
 required_pkgs/d2to1/setup.cfg                      |    5 +-
 required_pkgs/d2to1/setup.py                       |    2 +-
 required_pkgs/stsci.distutils/CHANGES.txt          |   22 +-
 required_pkgs/stsci.distutils/setup.cfg            |    2 +-
 .../stsci.distutils/stsci/distutils/hooks.py       |   25 +-
 .../stsci.distutils/stsci/distutils/release.py     |    2 +-
 .../stsci/distutils/versionutils.py                |  115 +--
 .../stsci.tools/lib/stsci/tools/capable.py         |    4 +-
 .../stsci.tools/lib/stsci/tools/tester.py          |    6 +-
 setup.cfg                                          |   10 +-
 setup.py                                           |   22 +-
 src/xutil.c                                        |   52 +-
 tools/createTarBall.csh                            |  190 ++--
 37 files changed, 1868 insertions(+), 799 deletions(-)

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