[SCM] Python interface to DS9 branch, debian, updated. ef6b8ba50c4586bd24ee8b216610fd69592a5300

[Ole Streicher]

The following commit has been merged in the debian branch:
commit ef6b8ba50c4586bd24ee8b216610fd69592a5300
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jul 29 12:16:32 2013 +0200

    Adopt version 1.7

diff --git a/debian/changelog b/debian/changelog
index 117d056..87dd409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pyds9 (1.7-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 29 Jul 2013 12:05:17 +0200
+
 python-pyds9 (1.6-1) unstable; urgency=low
 
   * Change distribution to unstable
diff --git a/debian/patches/use-default-xpalib.patch b/debian/patches/use-default-xpalib.patch
index b25b55e..42a3b6c 100644
--- a/debian/patches/use-default-xpalib.patch
+++ b/debian/patches/use-default-xpalib.patch
@@ -3,27 +3,27 @@ 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
-@@ -14,7 +14,7 @@
+@@ -20,7 +20,7 @@
  
  # make command for xpa
- xpadir='xpa-2.1.14'
+ 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)
      os.chdir(srcDir)
-@@ -64,8 +64,4 @@
+@@ -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'])],
+-    data_files=[('', [xpadir+'/'+xpalib, xpadir+'/'+xpans])],
 -    cmdclass = {'build_py': my_build_py, 	 \
 -                'install_data': my_install_data, \
 -                'clean': my_clean },
     )
 --- a/xpa.py
 +++ b/xpa.py
-@@ -24,7 +24,7 @@
+@@ -27,7 +27,7 @@
          return _fname
      return None
  
@@ -31,25 +31,27 @@ Description: Don't install and use the convienience copy provided in the
 +_libpath='libxpa.so.1'
  if _libpath:
      libxpa=ctypes.cdll.LoadLibrary(_libpath)
-     libc=ctypes.cdll.LoadLibrary(None)
+     _ulist=platform.uname()
 --- a/ds9.py
 +++ b/ds9.py
-@@ -75,17 +75,7 @@
+@@ -93,18 +93,8 @@
      of ds9 is displayed.
      """
      if xpa.xpaaccess("xpans", None, 1) == None:
--        _cmd = None
--        # look in install directories
+-        _cmd = False
+-        # look in install directories for xpans
 -        for _dir in sys.path:
--            _fname = os.path.join(_dir, "xpans")
+-            _fname = os.path.join(_dir, ds9Globals["progs"][0])
 -            if os.path.exists(_fname):
--                _cmd = _fname + " -e &"
+-                _cmd = True
+-                break
 -        # look in development directory
 -        if not _cmd:
--            _fname = './xpa-2.1.14/xpans'
+-            _fname = './xpa/' + ds9Globals["progs"][0]
 -            if os.path.exists(_fname):
--                _cmd = _fname + " -e &"
-+        _cmd = "xpans -e &"
+-                _cmd = True
++        _fname = ds9Globals["progs"][0]
++        _cmd = True
          if _cmd:
-             os.system(_cmd)
-             # if ds9 is already running, issue a warning
+             # start up xpans
+             subprocess.Popen([_fname, "-e"])
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4aed5f5..71ba7a7 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,4 +1,2 @@
 # Don't complain about files in an unused convienience copy
 python-pyds9 source: outdated-autotools-helper-file
-python-pyds9 source: configure-generated-file-in-source
-python-pyds9 source: source-contains-prebuilt-binary

-- 
Python interface to DS9