[python-astropy] 02/04: Cleanup patches

[Ole Streicher]

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

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

commit 1f1e9b95082bfcb9f083384985225c20becaffcf
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jan 31 16:55:53 2015 +0100

    Cleanup patches
---
 debian/patches/disable_helper.patch       |  8 +++-----
 debian/patches/helper_compatibility.patch |  6 +++---
 debian/patches/use_wcslib_4.24.patch      | 33 -------------------------------
 3 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 83f0d7c..2e751c9 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -1,11 +1,9 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Disable astropy-helpers copy
 Bug: https://bugs.debian.org/761055
-Index: astropy/setup.cfg
-===================================================================
---- astropy.orig/setup.cfg
-+++ astropy/setup.cfg
-@@ -22,7 +22,7 @@ background = static/dmg_background.png
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -22,7 +22,7 @@
  bitmap = static/wininst_background.bmp
  
  [ah_bootstrap]
diff --git a/debian/patches/helper_compatibility.patch b/debian/patches/helper_compatibility.patch
index a25e801..31a965c 100644
--- a/debian/patches/helper_compatibility.patch
+++ b/debian/patches/helper_compatibility.patch
@@ -1,9 +1,9 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Temporarily enable comatibility to astropy-helpers < 1.0.
 Bug: https://github.com/astropy/astropy/issues/3377
---- astropy.orig/setup.py
-+++ astropy/setup.py
-@@ -18,7 +18,7 @@ builtins._ASTROPY_SETUP_ = True
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@
  import astropy
  from astropy_helpers.setup_helpers import (
      register_commands, adjust_compiler, get_package_info, get_debug_option)
diff --git a/debian/patches/use_wcslib_4.24.patch b/debian/patches/use_wcslib_4.24.patch
deleted file mode 100644
index 1705435..0000000
--- a/debian/patches/use_wcslib_4.24.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use wcslib version 4.24 which is API incompatible to 4.23.
- 4.23 is still the version in astropy.
---- a/astropy/wcs/include/wcslib/wcs.h
-+++ b/astropy/wcs/include/wcslib/wcs.h
-@@ -1568,7 +1568,7 @@
- int wcssub(int alloc, const struct wcsprm *wcssrc, int *nsub, int axes[],
-            struct wcsprm *wcsdst);
- 
--int wcscompare(int cmp, const struct wcsprm *wcs1, const struct wcsprm *wcs2,
-+int wcscompare(int cmp, double tol, const struct wcsprm *wcs1, const struct wcsprm *wcs2,
-                int *equal);
- 
- int wcsfree(struct wcsprm *wcs);
---- a/astropy/wcs/src/wcslib_wrap.c
-+++ b/astropy/wcs/src/wcslib_wrap.c
-@@ -751,7 +751,7 @@
- 
-   wcsprm_python2c(&self->x);
-   wcsprm_python2c(&other->x);
--  status = wcscompare(cmp, &self->x, &other->x, &equal);
-+  status = wcscompare(cmp, 0.0, &self->x, &other->x, &equal);
-   wcsprm_c2python(&self->x);
-   wcsprm_c2python(&other->x);
- 
-@@ -1698,6 +1698,7 @@
-     wcsprm_python2c(bx);
-     status = wcscompare(
-         WCSCOMPARE_ANCILLARY,
-+	0.0,
-         ax, bx, &equal);
-     wcsprm_c2python(ax);
-     wcsprm_c2python(bx);

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