tags 570727 + pending thanks Dear maintainer,
I've prepared an NMU for xmldiff (versioned as 0.6.8-4.2) and uploaded it to DELAYED/2, according to devref §5.11.1. The patch is by Daiki Ueno and has been applied upstream already; see changelog for more details. Cheers. -- Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7 z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/ Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u xmldiff-0.6.8/debian/changelog xmldiff-0.6.8/debian/changelog --- xmldiff-0.6.8/debian/changelog +++ xmldiff-0.6.8/debian/changelog @@ -1,3 +1,12 @@ +xmldiff (0.6.8-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix id() calculation in extensions/maplookup.c; that fixes comparison + errors on minimal trees (on i386). Patch by Daiki Ueno, applied + upstream (see http://www.logilab.org/ticket/21853). (Closes: #570727) + + -- Stefano Zacchiroli <z...@debian.org> Thu, 18 Mar 2010 11:14:40 +0100 + xmldiff (0.6.8-4.1) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- xmldiff-0.6.8.orig/extensions/maplookup.c +++ xmldiff-0.6.8/extensions/maplookup.c @@ -40,12 +40,6 @@ /******************* functions specific to the fmes algorithm *****************/ -#if __WORDSIZE == 64 -#define KEYSHAPE "(l,l)" -#else -#define KEYSHAPE "(i,i)" -#endif - static short N_ISSUE = 5 ; /* function to init objects for the next functions @@ -162,11 +156,17 @@ { PyObject *key ; couple = PyList_GET_ITEM(_mapping, i) ; - key = Py_BuildValue(KEYSHAPE, (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; + key = PyTuple_New(2); + Py_INCREF(key); + PyTuple_SET_ITEM(key, 0, PyLong_FromVoidPtr(node1)); + PyTuple_SET_ITEM(key, 1, PyLong_FromVoidPtr(PyTuple_GET_ITEM(couple, 0))); if (PyDict_GetItem(_dict1, key) != NULL) { Py_DECREF(key) ; - key = Py_BuildValue(KEYSHAPE, (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; + key = PyTuple_New(2); + Py_INCREF(key); + PyTuple_SET_ITEM(key, 0, PyLong_FromVoidPtr(node2)); + PyTuple_SET_ITEM(key, 1, PyLong_FromVoidPtr(PyTuple_GET_ITEM(couple, 1))); if (PyDict_GetItem(_dict2, key) != NULL) { seq_num += 1 ;