diff -Nru python-pyds9-1.8.1/debian/changelog python-pyds9-1.8.1/debian/changelog --- python-pyds9-1.8.1/debian/changelog 2018-08-14 06:55:21.000000000 +0000 +++ python-pyds9-1.8.1/debian/changelog 2018-12-17 15:37:18.000000000 +0000 @@ -1,3 +1,22 @@ +python-pyds9 (1.8.1-5) unstable; urgency=low + + * Replace find_executable (not existing anymore) with shutil.which + + -- Ole Streicher Mon, 17 Dec 2018 16:37:18 +0100 + +python-pyds9 (1.8.1-4) unstable; urgency=low + + * Fix Python 3 compatibility of CI test + + -- Ole Streicher Sun, 16 Dec 2018 13:01:28 +0100 + +python-pyds9 (1.8.1-3) unstable; urgency=low + + * Remove Python 2 package + * Push Standards-Version to 4.2.1. No changes needed + + -- Ole Streicher Sat, 15 Dec 2018 13:49:53 +0100 + python-pyds9 (1.8.1-2) unstable; urgency=medium * Add Bug-Db and Repository to d/u/metadata diff -Nru python-pyds9-1.8.1/debian/control python-pyds9-1.8.1/debian/control --- python-pyds9-1.8.1/debian/control 2018-08-14 06:53:47.000000000 +0000 +++ python-pyds9-1.8.1/debian/control 2018-12-17 15:33:15.000000000 +0000 @@ -1,37 +1,18 @@ Source: python-pyds9 Section: python Priority: optional -Maintainer: Debian Astronomy Maintainers +Maintainer: Debian Astronomy Team Uploaders: Ole Streicher Build-Depends: debhelper (>= 11), dh-python, - python (>= 2.6.6-2~), - python-setuptools, - python-six, python3, python3-setuptools, python3-six -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Homepage: https://github.com/ericmandel/pyds9 Vcs-Git: https://salsa.debian.org/debian-astro-team/python-pyds9.git Vcs-Browser: https://salsa.debian.org/debian-astro-team/python-pyds9 -Package: python-pyds9 -Architecture: all -Depends: python-six, - xpa-tools, - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Recommends: python-astropy | python-pyfits, python-numpy, saods9 -Description: Communication with the ds9 image display program (Python-2) - The XPA messaging system provides seamless communication between many kinds - of Unix programs, including Tcl/Tk programs such as ds9. The pyds9 module - uses a Python interface to XPA to communicate with ds9. It supports - communication with all of ds9’s XPA access points. - . - This package provides the Python-2 version of the package. - Package: python3-pyds9 Architecture: all Depends: python3-six, @@ -39,11 +20,9 @@ ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} -Recommends: python3-astropy | python3-pyfits, python3-numpy, saods9 -Description: Communication with the ds9 image display program (Python-3) +Recommends: python3-astropy, python3-numpy, saods9 +Description: Communication with the ds9 image display program from Python The XPA messaging system provides seamless communication between many kinds of Unix programs, including Tcl/Tk programs such as ds9. The pyds9 module uses a Python interface to XPA to communicate with ds9. It supports communication with all of ds9’s XPA access points. - . - This package provides the Python-3 version of the package. diff -Nru python-pyds9-1.8.1/debian/patches/Replace-find_executable-not-existing-anymore-with-shutil..patch python-pyds9-1.8.1/debian/patches/Replace-find_executable-not-existing-anymore-with-shutil..patch --- python-pyds9-1.8.1/debian/patches/Replace-find_executable-not-existing-anymore-with-shutil..patch 1970-01-01 00:00:00.000000000 +0000 +++ python-pyds9-1.8.1/debian/patches/Replace-find_executable-not-existing-anymore-with-shutil..patch 2018-12-17 15:37:13.000000000 +0000 @@ -0,0 +1,32 @@ +From: Ole Streicher +Date: Mon, 17 Dec 2018 16:37:09 +0100 +Subject: Replace find_executable (not existing anymore) with shutil.which + +--- + pyds9.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyds9.py b/pyds9.py +index bd9393a..fb2dbb2 100644 +--- a/pyds9.py ++++ b/pyds9.py +@@ -2,7 +2,7 @@ from __future__ import (print_function, absolute_import, division, + unicode_literals) + + import contextlib +-from distutils.spawn import find_executable ++import shutil + import sys + import subprocess + import shlex +@@ -59,8 +59,8 @@ def get_xpans_ds9(): + xpans_path = os.pathsep.join([pyds9_dir, xpa_dir, xpans_path]) + + # find the executables +- xpans = find_executable('xpans', path=xpans_path) +- ds9 = [find_executable('ds9')] ++ xpans = shutil.which('xpans', path=xpans_path) ++ ds9 = [shutil.which('ds9')] + + # warning message in case ds9 and/or xpans is not found + ds9_warning = ("Can't locate DS9 executable. Please add the DS9 directory" diff -Nru python-pyds9-1.8.1/debian/patches/series python-pyds9-1.8.1/debian/patches/series --- python-pyds9-1.8.1/debian/patches/series 2017-02-03 16:12:22.000000000 +0000 +++ python-pyds9-1.8.1/debian/patches/series 2018-12-17 15:37:13.000000000 +0000 @@ -1 +1,2 @@ use-default-xpalib.patch +Replace-find_executable-not-existing-anymore-with-shutil..patch diff -Nru python-pyds9-1.8.1/debian/patches/use-default-xpalib.patch python-pyds9-1.8.1/debian/patches/use-default-xpalib.patch --- python-pyds9-1.8.1/debian/patches/use-default-xpalib.patch 2017-02-03 16:12:22.000000000 +0000 +++ python-pyds9-1.8.1/debian/patches/use-default-xpalib.patch 2018-12-17 15:37:13.000000000 +0000 @@ -1,9 +1,18 @@ -Author: Ole Streicher -Description: Don't install and use the convienience copy provided in the - source, but use the one installed by the "libxpa1" package. +From: Ole Streicher +Date: Mon, 17 Dec 2018 16:33:29 +0100 +Subject: Don't install and use the convienience copy provided in the + +source, but use the one installed by the "libxpa1" package. +--- + setup.py | 7 +------ + xpa.py | 2 +- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index b7550ed..7548421 100644 --- a/setup.py +++ b/setup.py -@@ -21,7 +21,7 @@ +@@ -21,7 +21,7 @@ else: xpadir = 'xpa' @@ -12,7 +21,7 @@ curdir = os.getcwd() srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir) os.chdir(srcDir) -@@ -86,10 +86,5 @@ +@@ -86,10 +86,5 @@ setup(name='pyds9', author_email='saord@cfa.harvard.edu', url='http://hea-www.harvard.edu/saord/ds9/', py_modules=['pyds9', 'xpa'], @@ -23,9 +32,11 @@ - 'clean': my_clean}, install_requires=['six'] ) +diff --git a/xpa.py b/xpa.py +index 822447f..284cccf 100644 --- a/xpa.py +++ b/xpa.py -@@ -28,7 +28,7 @@ +@@ -28,7 +28,7 @@ def _find_shlib(_libbase): return _fname return None diff -Nru python-pyds9-1.8.1/debian/rules python-pyds9-1.8.1/debian/rules --- python-pyds9-1.8.1/debian/rules 2017-02-03 16:12:22.000000000 +0000 +++ python-pyds9-1.8.1/debian/rules 2018-12-17 15:33:15.000000000 +0000 @@ -4,7 +4,7 @@ export PYBUILD_NAME = pyds9 %: - dh $@ --with python2,python3 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild override_dh_installchangelogs: dh_installchangelogs changelog diff -Nru python-pyds9-1.8.1/debian/tests/control python-pyds9-1.8.1/debian/tests/control --- python-pyds9-1.8.1/debian/tests/control 2017-02-03 16:12:22.000000000 +0000 +++ python-pyds9-1.8.1/debian/tests/control 2018-12-17 15:33:15.000000000 +0000 @@ -1,2 +1,2 @@ Tests: pyds9-test -Depends: python-astropy, python-pyds9, saods9, xauth, xpa-tools, xvfb +Depends: python3-astropy, python3-pyds9, saods9, xauth, xpa-tools, xvfb diff -Nru python-pyds9-1.8.1/debian/tests/pyds9-test python-pyds9-1.8.1/debian/tests/pyds9-test --- python-pyds9-1.8.1/debian/tests/pyds9-test 2017-02-03 16:12:22.000000000 +0000 +++ python-pyds9-1.8.1/debian/tests/pyds9-test 2018-12-17 15:33:15.000000000 +0000 @@ -7,12 +7,12 @@ cp test.fits "${ADTTMP}" cd "${ADTTMP}" -xvfb-run --server-args="-screen 0 1024x768x24" python <