diff -Nru pylibtiff-0.3.0~svn78/debian/changelog pylibtiff-0.3.0~svn78/debian/changelog --- pylibtiff-0.3.0~svn78/debian/changelog 2013-04-20 15:41:23.000000000 +0000 +++ pylibtiff-0.3.0~svn78/debian/changelog 2013-07-07 13:53:19.000000000 +0000 @@ -1,9 +1,14 @@ -pylibtiff (0.3.0~svn78-3ubuntu1) raring; urgency=low +pylibtiff (0.3.0~svn78-3.1) unstable; urgency=low - * allow-deprecated.patch: - to fix FTBS allow it to use the still supported 1.6 api. + * 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) - -- Julian Taylor Sat, 20 Apr 2013 17:36:18 +0200 + -- gregor herrmann Sun, 07 Jul 2013 15:53:16 +0200 pylibtiff (0.3.0~svn78-3) unstable; urgency=low diff -Nru pylibtiff-0.3.0~svn78/debian/control pylibtiff-0.3.0~svn78/debian/control --- pylibtiff-0.3.0~svn78/debian/control 2013-04-20 15:39:42.000000000 +0000 +++ pylibtiff-0.3.0~svn78/debian/control 2012-05-04 10:03:06.000000000 +0000 @@ -1,8 +1,7 @@ Source: pylibtiff Priority: optional Section: python -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team Uploaders: Mathieu Malaterre Build-Depends: debhelper (>= 8), python-all-dev (>= 2.6.6-3~), python-numpy, python-bitarray Standards-Version: 3.9.3 diff -Nru pylibtiff-0.3.0~svn78/debian/patches/allow-deprecated.patch pylibtiff-0.3.0~svn78/debian/patches/allow-deprecated.patch --- pylibtiff-0.3.0~svn78/debian/patches/allow-deprecated.patch 2013-04-20 15:36:00.000000000 +0000 +++ pylibtiff-0.3.0~svn78/debian/patches/allow-deprecated.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: uses < 1.7 api so we must allow deprecated apis -Bug: http://code.google.com/p/pylibtiff/issues/detail?id=23 -Author: Julian Taylor - ---- a/libtiff/src/bittools.c -+++ b/libtiff/src/bittools.c -@@ -1,5 +1,4 @@ - #include --#define NPY_NO_DEPRECATED_API - #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API - #include "numpy/arrayobject.h" - ---- a/libtiff/src/tif_lzw.c -+++ b/libtiff/src/tif_lzw.c -@@ -45,7 +45,6 @@ - - - #include --#define NPY_NO_DEPRECATED_API - #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API - #include "numpy/arrayobject.h" - diff -Nru pylibtiff-0.3.0~svn78/debian/patches/numpy_deprecated_api.patch pylibtiff-0.3.0~svn78/debian/patches/numpy_deprecated_api.patch --- pylibtiff-0.3.0~svn78/debian/patches/numpy_deprecated_api.patch 1970-01-01 00:00:00.000000000 +0000 +++ pylibtiff-0.3.0~svn78/debian/patches/numpy_deprecated_api.patch 2013-07-07 13:46:14.000000000 +0000 @@ -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: richcarni@gmail.com +Reviewed-by: gregor herrmann +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 +-#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 +-#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" + diff -Nru pylibtiff-0.3.0~svn78/debian/patches/series pylibtiff-0.3.0~svn78/debian/patches/series --- pylibtiff-0.3.0~svn78/debian/patches/series 2013-04-20 15:36:12.000000000 +0000 +++ pylibtiff-0.3.0~svn78/debian/patches/series 2013-07-07 13:42:25.000000000 +0000 @@ -1,3 +1,3 @@ bitarray.patch addtiff4.patch -allow-deprecated.patch +numpy_deprecated_api.patch