[Debian-astro-commits] [wcslib] 02/02: Remove fix that is now added upstream

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository wcslib.

commit 69c88f62e4849ff749d472236ad457e9942f1c89
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 19 10:16:13 2015 +0200

    Remove fix that is now added upstream
---
 debian/changelog                |  6 ++++++
 debian/patches/fix_wcspih.patch | 36 ------------------------------------
 debian/patches/series           |  1 -
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c03198..4abc418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcslib (5.11-1~exp1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 19 Oct 2015 10:14:45 +0200
+
 wcslib (5.10-1~exp1) experimental; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix_wcspih.patch b/debian/patches/fix_wcspih.patch
deleted file mode 100644
index d8e0f57..0000000
--- a/debian/patches/fix_wcspih.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix off-by-one initialization errors
- in wcspih_final() and watset().
---- a/C/wcspih.l
-+++ b/C/wcspih.l
-@@ -2214,7 +2214,7 @@
-   struct wcsprm **wcs)
- 
- {
--  char   field[8], *wp, wpoly[12], wtype[8];
-+  char   field[16], *wp, wpoly[12], wtype[8];
-   int    i, ialt, idp, ipv, m, npv, n, nterms, omax, omin, status, wctrl[4];
-   double A1, A2, A3, B1, B2, B3, CNPIX1, CNPIX2, *crval, Rx, Ry, S, wval,
-          X0, Y0, Xc, Yc;
---- a/C/flexed/wcspih.c
-+++ b/C/flexed/wcspih.c
-@@ -20869,7 +20869,7 @@
-   struct wcsprm **wcs)
- 
- {
--  char   field[8], *wp, wpoly[12], wtype[8];
-+  char   field[16], *wp, wpoly[12], wtype[8];
-   int    i, ialt, idp, ipv, m, npv, n, nterms, omax, omin, status, wctrl[4];
-   double A1, A2, A3, B1, B2, B3, CNPIX1, CNPIX2, *crval, Rx, Ry, S, wval,
-          X0, Y0, Xc, Yc;
---- a/C/dis.c
-+++ b/C/dis.c
-@@ -2717,7 +2717,7 @@
-                                 {40, 50, -1, -1, -1, -1, -1, -1, -1, -1},
-                                 {49, -1, -1, -1, -1, -1, -1, -1, -1, -1}};
- 
--  char   *fp, id[16];
-+  char   *fp, id[20];
-   int    deg, degree, doaux, idis, idp, im, in, *iparm, kind, m, n, ncoeff,
-          ndparm, niparm;
-   double coeff, coeffm[10], coeffn[10], *dparm, dx, dy, x0, xmax, xmin,
diff --git a/debian/patches/series b/debian/patches/series
index d54d258..2ffb5c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 increase_tspx_test_tol.patch
 disable_Ftspx_test.patch
-fix_wcspih.patch

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