[Debian-astro-commits] [python-pyds9] 02/02: Adjust patch for new version

[Ole Streicher]

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

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

commit 428731df7604e0acd6f46456c1ab305c3ec0ebd0
Author: Ole Streicher <ole at aip.de>
Date:   Fri Jan 29 09:47:07 2016 +0100

    Adjust patch for new version
---
 debian/changelog                        |  6 ++++++
 debian/patches/use-default-xpalib.patch | 26 +-------------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 904c159..affcd5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pyds9 (1.8.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Fri, 29 Jan 2016 09:46:41 +0100
+
 python-pyds9 (1.8-2) unstable; urgency=low
 
   * Add python-six to dependencies to fix CI failure
diff --git a/debian/patches/use-default-xpalib.patch b/debian/patches/use-default-xpalib.patch
index c2667a4..b84994f 100644
--- a/debian/patches/use-default-xpalib.patch
+++ b/debian/patches/use-default-xpalib.patch
@@ -15,7 +15,7 @@ Description: Don't install and use the convienience copy provided in the
 @@ -86,10 +86,5 @@
        author_email='saord at cfa.harvard.edu',
        url='http://hea-www.harvard.edu/saord/ds9/',
-       py_modules=['pyds9', 'xpa', 'ds9'],
+       py_modules=['pyds9', 'xpa'],
 -      data_files=[('', [os.path.join(xpadir, xpalib),
 -                        os.path.join(xpadir, xpans)])],
 -      cmdclass={'build_py': my_build_py,
@@ -34,27 +34,3 @@ Description: Don't install and use the convienience copy provided in the
  if _libpath:
      libxpa = ctypes.cdll.LoadLibrary(_libpath)
      _ulist = platform.uname()
---- a/pyds9.py
-+++ b/pyds9.py
-@@ -191,19 +191,8 @@
-     of ds9 is displayed.
-     """
-     if xpa.xpaaccess(b"xpans", None, 1) is None:
--        _cmd = False
--        # look in install directories for xpans
--        for _dir in sys.path:
--            _fname = os.path.join(_dir, ds9Globals["progs"][0])
--            if os.path.exists(_fname):
--                _cmd = True
--                break
--        # look in development directory
--        if not _cmd:
--            _fname = os.path.join(os.path.dirname(__file__), 'xpa',
--                                  ds9Globals["progs"][0])
--            if os.path.exists(_fname):
--                _cmd = True
-+        _fname = ds9Globals["progs"][0]
-+        _cmd = True
-         if _cmd:
-             # start up xpans
-             subprocess.Popen([_fname, "-e"])

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