Control: tag -1 + patch pending On Mon, 24 Jun 2013 22:27:55 +0600, Andrey Rahmatullin wrote:
> Instead pylibtiff has just #define NPY_NO_DEPRECATED_API. > This is fixed at > http://code.google.com/p/pylibtiff/source/detail?spec=svn93&r=92 I've prepared and uploaded an NMU to DELAYED/1. debdiff attached, changes committed in svn + tagged. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Funny Van Dannen: Dolores
Index: debian/changelog =================================================================== --- debian/changelog (revision 14105) +++ debian/changelog (working copy) @@ -1,3 +1,15 @@ +pylibtiff (0.3.0~svn78-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: ndarraytypes.h:681:82: error: operator '<=' has no right + operand": + add patch numpy_deprecated_api.patch from upstream svn to handle changes + in numpy 1.7. + Thanks to Andrey Rahmatullin for pointing to the upstream commit. + (Closes: #713588) + + -- gregor herrmann <gre...@debian.org> Sun, 07 Jul 2013 15:53:16 +0200 + pylibtiff (0.3.0~svn78-3) unstable; urgency=low * Add support for tiff4. Closes: #663490 Index: debian/patches/numpy_deprecated_api.patch =================================================================== --- debian/patches/numpy_deprecated_api.patch (revision 0) +++ debian/patches/numpy_deprecated_api.patch (working copy) @@ -0,0 +1,45 @@ +Description: updated bittools.c and tif_lzw.c to build with numpy v1.7.x c-api + . + support for PyArray_CORDER appears to have been removed in 1.7 and is replaced + by NPY_CORDER. NPY_CORDER has been supported since v1.0 +Origin: upstream, https://code.google.com/p/pylibtiff/source/detail?spec=svn93&r=92 +Bug: http://code.google.com/p/pylibtiff/issues/detail?id=23 +Bug-Debian: http://bugs.debian.org/713588 +Forwarded: http://code.google.com/p/pylibtiff/issues/detail?id=23 +Author: richca...@gmail.com +Reviewed-by: gregor herrmann <gre...@debian.org> +Last-Update: 2013-07-07 +Applied-Upstream: svn, r92 + +--- a/libtiff/src/tif_lzw.c ++++ b/libtiff/src/tif_lzw.c +@@ -45,7 +45,10 @@ + + + #include <Python.h> +-#define NPY_NO_DEPRECATED_API ++#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION ++#if NPY_VERSION < 0x01000009 ++ #define NPY_CORDER PyArray_CORDER ++#endif + #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API + #include "numpy/arrayobject.h" + +@@ -1215,7 +1218,7 @@ + dims[0] -= occ; + newshape.ptr = dims; + newshape.len = 1; +- if (PyArray_Resize((PyArrayObject*)result, &newshape, 0, PyArray_CORDER)==NULL) ++ if (PyArray_Resize((PyArrayObject*)result, &newshape, 0, NPY_CORDER)==NULL) + return NULL; + } + } +--- a/libtiff/src/bittools.c ++++ b/libtiff/src/bittools.c +@@ -1,5 +1,5 @@ + #include <Python.h> +-#define NPY_NO_DEPRECATED_API ++#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API + #include "numpy/arrayobject.h" + Index: debian/patches/series =================================================================== --- debian/patches/series (revision 14105) +++ debian/patches/series (working copy) @@ -1,2 +1,3 @@ bitarray.patch addtiff4.patch +numpy_deprecated_api.patch
signature.asc
Description: Digital signature
