[Debian-astro-commits] [python-pyraf] 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-pyraf.

commit 9083e1b4b0379b2c3f675c7ca35d161d48b2ee0d
Merge: 7ac772b 509112c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 1 11:33:04 2015 +0100

    Merge branch 'upstream' into debian

 PKG-INFO                                           |   2 +-
 lib/pyraf.egg-info/PKG-INFO                        |   2 +-
 lib/pyraf/version.py                               |  10 ++---
 lib/pyraf/version.py.orig1                         |   6 +--
 lib/pyraf/version.py.orig2                         |   6 +--
 lib/pyraf/wutil.py                                 |  41 +++++++++++----------
 lib/pyraf_setup.pyc                                | Bin 3313 -> 3313 bytes
 .../stsci.tools/lib/stsci/tools/capable.py         |  11 +++++-
 .../stsci.tools/lib/stsci/tools/iterfile.py        |   7 ++--
 .../stsci.tools/lib/stsci/tools/logutil.py         |  26 ++++++++++++-
 required_pkgs/stsci.tools/setup.cfg                |  17 +++++----
 required_pkgs/stsci.tools/setup.cfg.orig           |  17 +++++----
 setup.cfg                                          |   2 +-
 13 files changed, 91 insertions(+), 56 deletions(-)

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