diff -u skencil-0.6.17/debian/changelog skencil-0.6.17/debian/changelog --- skencil-0.6.17/debian/changelog +++ skencil-0.6.17/debian/changelog @@ -1,3 +1,13 @@ +skencil (0.6.17-14ubuntu2) hardy; urgency=low + + * debian/patches/10-fix-python2.5-mem.dpatch: Fixes for Python 2.5, + avoiding mixing memory allocators and deallocators for Python + objects, Python allocated memory and malloc allocated memory. + * debian/patches/00list: updated. + * debian/rules: Add "*.o" to the list of files cleaned up. + + -- Peter Clifton Fri, 08 Feb 2008 19:09:52 +0000 + skencil (0.6.17-14ubuntu1) hardy; urgency=low * Modify Maintainer value to match the DebianMaintainerField specification. diff -u skencil-0.6.17/debian/rules skencil-0.6.17/debian/rules --- skencil-0.6.17/debian/rules +++ skencil-0.6.17/debian/rules @@ -32,7 +32,7 @@ [ ! -f Makefile ] || $(MAKE) -C Filter clean [ ! -f Makefile ] || $(MAKE) -C Pax clean [ ! -f Makefile ] || $(MAKE) -C Sketch/Modules clean - -find . -name "Makefile" -o -name "Makefile.pre" -o -name '*.pyc' -o -name '*.so' | xargs rm -f + -find . -name "Makefile" -o -name "Makefile.pre" -o -name '*.pyc' -o -name '*.so' -o -name '*.o' | xargs rm -f dh_clean diff -u skencil-0.6.17/debian/patches/00list skencil-0.6.17/debian/patches/00list --- skencil-0.6.17/debian/patches/00list +++ skencil-0.6.17/debian/patches/00list @@ -9,0 +10 @@ +10-fix-python2.5-mem.dpatch only in patch2: unchanged: --- skencil-0.6.17.orig/debian/patches/10-fix-python2.5-mem.dpatch +++ skencil-0.6.17/debian/patches/10-fix-python2.5-mem.dpatch @@ -0,0 +1,319 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix-python2.5-mem.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad skencil-0.6.17~/Filter/binfile.c skencil-0.6.17/Filter/binfile.c +--- skencil-0.6.17~/Filter/binfile.c 2002-05-01 18:38:49.000000000 +0100 ++++ skencil-0.6.17/Filter/binfile.c 2008-02-08 19:07:42.000000000 +0000 +@@ -277,7 +277,7 @@ + binfile_dealloc(BinaryInputObject * self) + { + Py_DECREF(self->stream); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +diff -urNad skencil-0.6.17~/Filter/filterobj.c skencil-0.6.17/Filter/filterobj.c +--- skencil-0.6.17~/Filter/filterobj.c 2002-05-04 22:58:33.000000000 +0100 ++++ skencil-0.6.17/Filter/filterobj.c 2008-02-08 19:07:42.000000000 +0000 +@@ -126,7 +126,7 @@ + if (!self->buffer) + { + error: +- PyMem_DEL(self); ++ PyObject_FREE(self); + PyErr_NoMemory(); + if (dealloc) + dealloc(client_data); +@@ -216,7 +216,7 @@ + Py_DECREF(self->filtername); + Py_DECREF(self->stream); + PyMem_DEL(self->buffer); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +diff -urNad skencil-0.6.17~/Filter/subfilefilter.c skencil-0.6.17/Filter/subfilefilter.c +--- skencil-0.6.17~/Filter/subfilefilter.c 2002-05-01 18:38:49.000000000 +0100 ++++ skencil-0.6.17/Filter/subfilefilter.c 2008-02-08 19:07:42.000000000 +0000 +@@ -90,7 +90,7 @@ + { + SubFileDecodeState * state = (SubFileDecodeState*)clientdata; + Py_DECREF(state->delim_object); +- PyMem_DEL(state); ++ free(state); + } + + static void +diff -urNad skencil-0.6.17~/Pax/borderobject.c skencil-0.6.17/Pax/borderobject.c +--- skencil-0.6.17~/Pax/borderobject.c 2002-05-04 21:49:06.000000000 +0100 ++++ skencil-0.6.17/Pax/borderobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -40,7 +40,7 @@ + { + Tk_Free3DBorder(self->tkborder); + } +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + /* a converter function suitable for PyArg_ParseTuple */ +diff -urNad skencil-0.6.17~/Pax/cmapobject.c skencil-0.6.17/Pax/cmapobject.c +--- skencil-0.6.17~/Pax/cmapobject.c 2001-02-11 19:22:12.000000000 +0000 ++++ skencil-0.6.17/Pax/cmapobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -345,7 +345,7 @@ + if (self->owner) + XFreeColormap(self->display, self->colormap); + +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + PyTypeObject PaxCMapType = { +diff -urNad skencil-0.6.17~/Pax/fontobject.c skencil-0.6.17/Pax/fontobject.c +--- skencil-0.6.17~/Pax/fontobject.c 2001-04-30 15:11:19.000000000 +0100 ++++ skencil-0.6.17/Pax/fontobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -69,7 +69,7 @@ + f->font_struct = XLoadQueryFont(display, name); + if (f->font_struct == NULL) + { +- PyMem_DEL(f); ++ PyObject_FREE(f); + PyErr_SetString(PyExc_RuntimeError, "no such font"); + return NULL; + } +@@ -87,7 +87,7 @@ + f->font_struct = XQueryFont(display, fid); + if (f->font_struct == NULL) + { +- PyMem_DEL(f); ++ PyObject_FREE(f); + PyErr_SetString(PyExc_RuntimeError, "no such font"); + return NULL; + } +@@ -269,7 +269,7 @@ + XFreeFontInfo(NULL, self->font_struct, 1); + else + XFreeFont(self->display, self->font_struct); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + PyTypeObject PaxFontType = { +diff -urNad skencil-0.6.17~/Pax/gcobject.c skencil-0.6.17/Pax/gcobject.c +--- skencil-0.6.17~/Pax/gcobject.c 2001-04-30 15:11:20.000000000 +0100 ++++ skencil-0.6.17/Pax/gcobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -478,7 +478,7 @@ + else if (self->shared == PAXGC_OWNED) + XFreeGC(self->display, self->gc); + Py_XDECREF(self->drawable_object); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + PyTypeObject PaxGCType = +diff -urNad skencil-0.6.17~/Pax/imageobject.c skencil-0.6.17/Pax/imageobject.c +--- skencil-0.6.17~/Pax/imageobject.c 2000-06-15 19:39:18.000000000 +0100 ++++ skencil-0.6.17/Pax/imageobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -159,7 +159,7 @@ + #endif + XDestroyImage(self->ximage); + +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + PyTypeObject PaxImageType = { +diff -urNad skencil-0.6.17~/Pax/paxtkinter.c skencil-0.6.17/Pax/paxtkinter.c +--- skencil-0.6.17~/Pax/paxtkinter.c 2004-08-07 20:52:22.000000000 +0100 ++++ skencil-0.6.17/Pax/paxtkinter.c 2008-02-08 19:07:42.000000000 +0000 +@@ -1499,7 +1499,7 @@ + + Py_XDECREF(func); + +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +@@ -1825,7 +1825,7 @@ + ENTER_TCL + Tcl_DeleteInterp(Tkapp_Interp(self)); + LEAVE_TCL +- PyMem_DEL(self); ++ PyObject_FREE(self); + DisableEventHook(); + } + +diff -urNad skencil-0.6.17~/Pax/pixmapobject.c skencil-0.6.17/Pax/pixmapobject.c +--- skencil-0.6.17~/Pax/pixmapobject.c 2002-02-16 18:54:54.000000000 +0000 ++++ skencil-0.6.17/Pax/pixmapobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -381,7 +381,7 @@ + { + if (self->owner) + XFreePixmap(self->display, self->pixmap); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + PyTypeObject PaxPixmapType = { +diff -urNad skencil-0.6.17~/Pax/regionobject.c skencil-0.6.17/Pax/regionobject.c +--- skencil-0.6.17~/Pax/regionobject.c 2002-05-04 21:49:49.000000000 +0100 ++++ skencil-0.6.17/Pax/regionobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -178,7 +178,7 @@ + region_dealloc(PaxRegionObject *self) + { + XDestroyRegion(self->region); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + +diff -urNad skencil-0.6.17~/Pax/tkwinobject.c skencil-0.6.17/Pax/tkwinobject.c +--- skencil-0.6.17~/Pax/tkwinobject.c 2002-05-04 21:50:02.000000000 +0100 ++++ skencil-0.6.17/Pax/tkwinobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -47,7 +47,7 @@ + static void + tkwin_dealloc(TkWinObject * self) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + +diff -urNad skencil-0.6.17~/Sketch/Modules/curveobject.c skencil-0.6.17/Sketch/Modules/curveobject.c +--- skencil-0.6.17~/Sketch/Modules/curveobject.c 2003-03-15 22:29:45.000000000 +0000 ++++ skencil-0.6.17/Sketch/Modules/curveobject.c 2008-02-08 19:07:42.000000000 +0000 +@@ -117,7 +117,7 @@ + self->segments = malloc(length * sizeof(CurveSegment)); + if (!self->segments) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + return PyErr_NoMemory(); + } + self->allocated = length; +@@ -218,7 +218,7 @@ + curve_dealloc(SKCurveObject * self) + { + free(self->segments); +- PyMem_DEL(self); ++ PyObject_FREE(self); + paths_allocated--; + } + +diff -urNad skencil-0.6.17~/Sketch/Modules/pstokenize.c skencil-0.6.17/Sketch/Modules/pstokenize.c +--- skencil-0.6.17~/Sketch/Modules/pstokenize.c 2001-05-12 20:24:49.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/pstokenize.c 2008-02-08 19:07:42.000000000 +0000 +@@ -691,7 +691,7 @@ + pstokenizer_dealloc(PSTokenizerObject * self) + { + Py_DECREF(self->source); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +diff -urNad skencil-0.6.17~/Sketch/Modules/skaux.c skencil-0.6.17/Sketch/Modules/skaux.c +--- skencil-0.6.17~/Sketch/Modules/skaux.c 2002-05-04 21:43:51.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/skaux.c 2008-02-08 19:07:42.000000000 +0000 +@@ -287,7 +287,7 @@ + self->dict = PyDict_New(); + if (!self->dict) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + return NULL; + } + +@@ -298,7 +298,7 @@ + SKCache_dealloc(SKCacheObject * self) + { + Py_DECREF(self->dict); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +diff -urNad skencil-0.6.17~/Sketch/Modules/skcolor.c skencil-0.6.17/Sketch/Modules/skcolor.c +--- skencil-0.6.17~/Sketch/Modules/skcolor.c 2002-05-04 21:44:46.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/skcolor.c 2008-02-08 19:07:42.000000000 +0000 +@@ -103,7 +103,7 @@ + self->ob_type = (PyTypeObject*)free_list; + free_list = self; + #else +- PyMem_DEL(self); ++ PyObject_FREE(self); + #endif + #if SKCOLOR_COUNT_ALLOC + skcolor_allocated--; +@@ -594,7 +594,7 @@ + self->visualinfo = PyMem_NEW(XVisualInfo, 1); + if (!self->visualinfo) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + return PyErr_NoMemory(); + } + memcpy(self->visualinfo, info, sizeof(XVisualInfo)); +@@ -629,7 +629,7 @@ + if (self->free_extra) + self->free_extra(self); + free(self->visualinfo); +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + static PyObject * +diff -urNad skencil-0.6.17~/Sketch/Modules/skfm.c skencil-0.6.17/Sketch/Modules/skfm.c +--- skencil-0.6.17~/Sketch/Modules/skfm.c 2002-05-04 21:45:06.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/skfm.c 2008-02-08 19:07:42.000000000 +0000 +@@ -85,7 +85,7 @@ + static void + skfm_dealloc(SKFontMetric * self) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + } + + +diff -urNad skencil-0.6.17~/Sketch/Modules/skpoint.c skencil-0.6.17/Sketch/Modules/skpoint.c +--- skencil-0.6.17~/Sketch/Modules/skpoint.c 2002-05-04 21:40:50.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/skpoint.c 2008-02-08 19:07:42.000000000 +0000 +@@ -62,7 +62,7 @@ + static void + skpoint_dealloc(SKPointObject * self) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + #if SKPOINT_COUNT_ALLOC + allocated -= 1; + #endif +diff -urNad skencil-0.6.17~/Sketch/Modules/skrect.c skencil-0.6.17/Sketch/Modules/skrect.c +--- skencil-0.6.17~/Sketch/Modules/skrect.c 2002-05-04 21:45:32.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/skrect.c 2008-02-08 19:07:42.000000000 +0000 +@@ -114,7 +114,7 @@ + self->ob_type = (PyTypeObject*)free_list; + free_list = self; + #else +- PyMem_DEL(self); ++ PyObject_FREE(self); + #endif + #if SKRECT_COUNT_ALLOC + allocated--; +diff -urNad skencil-0.6.17~/Sketch/Modules/sktrafo.c skencil-0.6.17/Sketch/Modules/sktrafo.c +--- skencil-0.6.17~/Sketch/Modules/sktrafo.c 2002-06-15 19:02:53.000000000 +0100 ++++ skencil-0.6.17/Sketch/Modules/sktrafo.c 2008-02-08 19:07:42.000000000 +0000 +@@ -82,7 +82,7 @@ + static void + sktrafo_dealloc(SKTrafoObject * self) + { +- PyMem_DEL(self); ++ PyObject_FREE(self); + #if SKTRAFO_COUNT_ALLOC + allocated--; + #endif