[Debian-astro-commits] [python-pyds9] 03/09: 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 83101ec79f991eda21d702a5cff6ff5b69752360
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 19 10:45:05 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 3542a25..24b1259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pyds9 (1.8-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 19 Oct 2015 10:32:03 +0200
+
 python-pyds9 (1.7-4) unstable; urgency=low
 
   * Add astropy dependency to CI test
diff --git a/debian/patches/use-default-xpalib.patch b/debian/patches/use-default-xpalib.patch
index 42a3b6c..c2667a4 100644
--- a/debian/patches/use-default-xpalib.patch
+++ b/debian/patches/use-default-xpalib.patch
@@ -3,41 +3,43 @@ Description: Don't install and use the convienience copy provided in the
  source, but use the one installed by the "libxpa1" package.
 --- a/setup.py
 +++ b/setup.py
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
+ xpadir = 'xpa'
+ 
  
- # make command for xpa
- xpadir='xpa-2.1.15'
 -def make(which):
 +def _disabled_make(which):
-     curdir=os.getcwd()
-     srcDir=os.path.join(os.path.dirname(os.path.abspath(__file__)),xpadir)
+     curdir = os.getcwd()
+     srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir)
      os.chdir(srcDir)
-@@ -80,8 +80,4 @@
-     author_email='saord at cfa.harvard.edu',
-     url='http://hea-www.harvard.edu/saord/ds9/',
-     py_modules=['ds9', 'xpa'],
--    data_files=[('', [xpadir+'/'+xpalib, xpadir+'/'+xpans])],
--    cmdclass = {'build_py': my_build_py, 	 \
--                'install_data': my_install_data, \
--                'clean': my_clean },
-    )
+@@ -86,10 +86,5 @@
+       author_email='saord at cfa.harvard.edu',
+       url='http://hea-www.harvard.edu/saord/ds9/',
+       py_modules=['pyds9', 'xpa', 'ds9'],
+-      data_files=[('', [os.path.join(xpadir, xpalib),
+-                        os.path.join(xpadir, xpans)])],
+-      cmdclass={'build_py': my_build_py,
+-                'install_data': my_install_data,
+-                'clean': my_clean},
+       install_requires=['six']
+       )
 --- a/xpa.py
 +++ b/xpa.py
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
          return _fname
      return None
  
--_libpath=_find_shlib('xpa')
-+_libpath='libxpa.so.1'
+-_libpath = _find_shlib('xpa')
++_libpath = 'libxpa.so.1'
  if _libpath:
-     libxpa=ctypes.cdll.LoadLibrary(_libpath)
-     _ulist=platform.uname()
---- a/ds9.py
-+++ b/ds9.py
-@@ -93,18 +93,8 @@
+     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("xpans", None, 1) == None:
+     if xpa.xpaaccess(b"xpans", None, 1) is None:
 -        _cmd = False
 -        # look in install directories for xpans
 -        for _dir in sys.path:
@@ -47,7 +49,8 @@ Description: Don't install and use the convienience copy provided in the
 -                break
 -        # look in development directory
 -        if not _cmd:
--            _fname = './xpa/' + ds9Globals["progs"][0]
+-            _fname = os.path.join(os.path.dirname(__file__), 'xpa',
+-                                  ds9Globals["progs"][0])
 -            if os.path.exists(_fname):
 -                _cmd = True
 +        _fname = ds9Globals["progs"][0]

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