[Debian-astro-commits] [python-pyraf] 01/02: 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 01897d01030340eeb8bda4407f5676ae697791ed
Merge: d281e41 7099355
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Oct 22 10:02:43 2015 +0200

    Merge branch 'upstream' into debian

 PKG-INFO                                           |   7 +-
 TEST_COMMIT                                        |   8 -
 data/PyRAF_exe.was                                 | Bin 90326 -> 0 bytes
 defsetup.py                                        |  16 +-
 lib/pyraf.egg-info/PKG-INFO                        |   7 +-
 lib/pyraf.egg-info/SOURCES.txt                     |   4 +-
 lib/pyraf/aqutil.py                                |  16 +-
 lib/pyraf/gkitkbase.py                             |  10 +-
 lib/pyraf/irafimport.py                            |  12 +-
 lib/pyraf/msgiowidget.py                           |  20 +-
 lib/pyraf/version.py                               |  10 +-
 lib/pyraf/version.py.orig1                         |   6 +-
 lib/pyraf/version.py.orig2                         |   6 +-
 lib/pyraf/wutil.py                                 |  19 +-
 lib/pyraf_setup.py                                 |   6 +-
 lib/pyraf_setup.pyc                                | Bin 3295 -> 3313 bytes
 .../stsci/distutils/command/build_optional_ext.py  |  10 +-
 .../stsci.distutils/stsci/distutils/hooks.py       |   8 +-
 .../stsci.distutils/stsci/distutils/release.py     |  14 +-
 .../stsci.distutils/stsci/distutils/svnutils.py    |   3 -
 .../stsci/distutils/tests/__init__.py              |   2 +-
 .../stsci.distutils/stsci/distutils/tests/util.py  |   9 +-
 required_pkgs/stsci.tools/doc/source/bitmask.rst   |  10 +
 required_pkgs/stsci.tools/doc/source/index.rst     |   3 +-
 required_pkgs/stsci.tools/lib/stsci/tools/alert.py |   7 +-
 .../stsci.tools/lib/stsci/tools/asnutil.py         | 186 +++++++++--------
 .../stsci.tools/lib/stsci/tools/basicpar.py        |  89 ++++----
 .../stsci.tools/lib/stsci/tools/bitmask.py         | 223 +++++++++++++++++++++
 .../stsci.tools/lib/stsci/tools/capable.py         |  42 ++--
 .../stsci.tools/lib/stsci/tools/cfgpars.py         |  45 +++--
 .../stsci.tools/lib/stsci/tools/check_files.py     |  72 +++----
 .../lib/stsci/tools/clipboard_helper.py            |  17 +-
 .../stsci.tools/lib/stsci/tools/compmixin.py       |  26 ++-
 .../stsci.tools/lib/stsci/tools/configobj.py       |  93 +++++----
 .../stsci.tools/lib/stsci/tools/convertgeis.py     |  72 ++++---
 .../lib/stsci/tools/convertwaiveredfits.py         |  96 +++++----
 .../stsci.tools/lib/stsci/tools/dialog.py          |   9 +-
 .../stsci.tools/lib/stsci/tools/editpar.py         |  44 ++--
 .../stsci.tools/lib/stsci/tools/eparoption.py      |  34 ++--
 .../stsci.tools/lib/stsci/tools/filedlg.py         |  27 ++-
 .../stsci.tools/lib/stsci/tools/fileutil.py        |  67 ++++---
 .../stsci.tools/lib/stsci/tools/fitsdiff.py        |  15 +-
 .../stsci.tools/lib/stsci/tools/for2to3.py         |   6 +-
 required_pkgs/stsci.tools/lib/stsci/tools/gfit.py  |  12 +-
 .../stsci.tools/lib/stsci/tools/imageiter.py       |   5 +-
 .../stsci.tools/lib/stsci/tools/irafglob.py        |   4 +-
 .../stsci.tools/lib/stsci/tools/irafglobals.py     |  30 ++-
 .../stsci.tools/lib/stsci/tools/irafutils.py       |  54 +++--
 .../stsci.tools/lib/stsci/tools/iterfile.py        |   4 +-
 .../stsci.tools/lib/stsci/tools/linefit.py         |  10 +-
 .../stsci.tools/lib/stsci/tools/listdlg.py         |  29 ++-
 .../stsci.tools/lib/stsci/tools/logutil.py         |  68 ++++---
 .../stsci.tools/lib/stsci/tools/minmatch.py        | 106 +++++-----
 .../stsci.tools/lib/stsci/tools/mputil.py          |   7 +-
 .../stsci.tools/lib/stsci/tools/nimageiter.py      |  14 +-
 .../stsci.tools/lib/stsci/tools/nmpfit.py          |  44 ++--
 .../stsci.tools/lib/stsci/tools/numerixenv.py      |  14 +-
 .../stsci.tools/lib/stsci/tools/parseinput.py      |   8 +-
 .../stsci.tools/lib/stsci/tools/readgeis.py        |  64 +++---
 required_pkgs/stsci.tools/lib/stsci/tools/stash.py |   3 +-
 .../stsci.tools/lib/stsci/tools/stpyfits.py        |  22 +-
 .../lib/stsci/tools/stsci_distutils_hack.py        |   4 +-
 .../stsci.tools/lib/stsci/tools/swapgeis.py        |  80 ++++----
 required_pkgs/stsci.tools/lib/stsci/tools/teal.py  |  90 +++++----
 .../stsci.tools/lib/stsci/tools/teal_bttn.py       |  14 +-
 .../stsci.tools/lib/stsci/tools/tester.py          |   2 +-
 .../stsci.tools/lib/stsci/tools/testutil.py        |  10 +-
 .../stsci.tools/lib/stsci/tools/tkrotext.py        |  20 +-
 .../stsci.tools/lib/stsci/tools/validate.py        |  94 +++++----
 .../stsci.tools/lib/stsci/tools/versioninfo.py     |  42 ++--
 .../stsci.tools/lib/stsci/tools/vtor_checks.py     |  36 ++--
 .../stsci.tools/lib/stsci/tools/wcsutil.py         |  64 +++---
 .../stsci.tools/lib/stsci/tools/xyinterp.py        |   8 +-
 required_pkgs/stsci.tools/scripts/stscidocs        |  14 +-
 setup.cfg                                          |   7 +-
 75 files changed, 1397 insertions(+), 962 deletions(-)

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