diff -u dia-0.95.0/debian/changelog dia-0.95.0/debian/changelog --- dia-0.95.0/debian/changelog +++ dia-0.95.0/debian/changelog @@ -1,3 +1,9 @@ +dia (0.95.0-4.1ubuntu3) feisty; urgency=low + + * Apply patch from upstream SVN to fix SEGV with python 2.5. + + -- Steve Kowalik Wed, 24 Jan 2007 21:39:39 +1100 + dia (0.95.0-4.1ubuntu2) feisty; urgency=low * Rebuild for python2.5 as the default python version. only in patch2: unchanged: --- dia-0.95.0.orig/debian/patches/01-ubuntu-python2.5-segv.dpatch +++ dia-0.95.0/debian/patches/01-ubuntu-python2.5-segv.dpatch @@ -0,0 +1,209 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-ubuntu-python2.5-segv.dpatch by Steve Kowalik +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix segfault with Python 2.5 by using PyObject_DEL instead of +## DP: PyMem_DEL. Patch from upstream SVN. + +@DPATCH@ +diff -urNad dia-0.95.0~/plug-ins/python/pydia-color.c dia-0.95.0/plug-ins/python/pydia-color.c +--- dia-0.95.0~/plug-ins/python/pydia-color.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-color.c 2007-01-24 21:42:38.000000000 +1100 +@@ -43,7 +43,7 @@ + static void + PyDiaColor_Dealloc(PyObject *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-cpoint.c dia-0.95.0/plug-ins/python/pydia-cpoint.c +--- dia-0.95.0~/plug-ins/python/pydia-cpoint.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-cpoint.c 2007-01-24 21:42:38.000000000 +1100 +@@ -38,7 +38,7 @@ + static void + PyDiaConnectionPoint_Dealloc(PyDiaConnectionPoint *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-diagram.c dia-0.95.0/plug-ins/python/pydia-diagram.c +--- dia-0.95.0~/plug-ins/python/pydia-diagram.c 2005-12-04 21:07:13.000000000 +1100 ++++ dia-0.95.0/plug-ins/python/pydia-diagram.c 2007-01-24 21:42:38.000000000 +1100 +@@ -50,7 +50,7 @@ + PyDiaDiagram_Dealloc(PyDiaDiagram *self) + { + g_object_unref(self->dia); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-diagramdata.c dia-0.95.0/plug-ins/python/pydia-diagramdata.c +--- dia-0.95.0~/plug-ins/python/pydia-diagramdata.c 2005-12-04 21:07:13.000000000 +1100 ++++ dia-0.95.0/plug-ins/python/pydia-diagramdata.c 2007-01-24 21:42:38.000000000 +1100 +@@ -46,7 +46,7 @@ + PyDiaDiagramData_Dealloc(PyDiaDiagramData *self) + { + g_object_unref (self->data); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-display.c dia-0.95.0/plug-ins/python/pydia-display.c +--- dia-0.95.0~/plug-ins/python/pydia-display.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-display.c 2007-01-24 21:42:38.000000000 +1100 +@@ -38,7 +38,7 @@ + static void + PyDiaDisplay_Dealloc(PyDiaDisplay *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-error.c dia-0.95.0/plug-ins/python/pydia-error.c +--- dia-0.95.0~/plug-ins/python/pydia-error.c 2007-01-24 21:40:33.000000000 +1100 ++++ dia-0.95.0/plug-ins/python/pydia-error.c 2007-01-24 21:42:38.000000000 +1100 +@@ -84,7 +84,7 @@ + { + if (self->str) + g_string_free (self->str, TRUE); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-export.c dia-0.95.0/plug-ins/python/pydia-export.c +--- dia-0.95.0~/plug-ins/python/pydia-export.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-export.c 2007-01-24 21:42:38.000000000 +1100 +@@ -37,7 +37,7 @@ + static void + PyDiaExportFilter_Dealloc(PyDiaExportFilter *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-font.c dia-0.95.0/plug-ins/python/pydia-font.c +--- dia-0.95.0~/plug-ins/python/pydia-font.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-font.c 2007-01-24 21:42:38.000000000 +1100 +@@ -48,7 +48,7 @@ + { + if (self->font) + dia_font_unref (self->font); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-geometry.c dia-0.95.0/plug-ins/python/pydia-geometry.c +--- dia-0.95.0~/plug-ins/python/pydia-geometry.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-geometry.c 2007-01-24 21:42:38.000000000 +1100 +@@ -135,7 +135,7 @@ + static void + PyDiaGeometry_Dealloc(void *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-handle.c dia-0.95.0/plug-ins/python/pydia-handle.c +--- dia-0.95.0~/plug-ins/python/pydia-handle.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-handle.c 2007-01-24 21:42:38.000000000 +1100 +@@ -40,7 +40,7 @@ + static void + PyDiaHandle_Dealloc(PyDiaHandle *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-image.c dia-0.95.0/plug-ins/python/pydia-image.c +--- dia-0.95.0~/plug-ins/python/pydia-image.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-image.c 2007-01-24 21:42:38.000000000 +1100 +@@ -45,7 +45,7 @@ + PyDiaImage_Dealloc(PyDiaImage *self) + { + dia_image_release (self->image); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-layer.c dia-0.95.0/plug-ins/python/pydia-layer.c +--- dia-0.95.0~/plug-ins/python/pydia-layer.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-layer.c 2007-01-24 21:42:38.000000000 +1100 +@@ -38,7 +38,7 @@ + static void + PyDiaLayer_Dealloc(PyDiaLayer *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-object.c dia-0.95.0/plug-ins/python/pydia-object.c +--- dia-0.95.0~/plug-ins/python/pydia-object.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-object.c 2007-01-24 21:42:38.000000000 +1100 +@@ -40,7 +40,7 @@ + static void + PyDiaObject_Dealloc(PyDiaObject *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +@@ -250,7 +250,7 @@ + static void + PyDiaObjectType_Dealloc(PyDiaObjectType *self) + { +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + static int +diff -urNad dia-0.95.0~/plug-ins/python/pydia-properties.c dia-0.95.0/plug-ins/python/pydia-properties.c +--- dia-0.95.0~/plug-ins/python/pydia-properties.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-properties.c 2007-01-24 21:42:38.000000000 +1100 +@@ -46,7 +46,7 @@ + PyDiaProperties_Dealloc(PyDiaObject *self) + { + self->object = NULL; /* XXX: should dec ref */ +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-property.c dia-0.95.0/plug-ins/python/pydia-property.c +--- dia-0.95.0~/plug-ins/python/pydia-property.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-property.c 2007-01-24 21:42:38.000000000 +1100 +@@ -60,7 +60,7 @@ + PyDiaProperty_Dealloc(PyDiaProperty *self) + { + self->property->ops->free(self->property); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* +diff -urNad dia-0.95.0~/plug-ins/python/pydia-text.c dia-0.95.0/plug-ins/python/pydia-text.c +--- dia-0.95.0~/plug-ins/python/pydia-text.c 2005-08-29 15:17:52.000000000 +1000 ++++ dia-0.95.0/plug-ins/python/pydia-text.c 2007-01-24 21:42:38.000000000 +1100 +@@ -49,7 +49,7 @@ + PyDiaText_Dealloc(PyDiaText *self) + { + g_free (self->text_data); +- PyMem_DEL(self); ++ PyObject_DEL(self); + } + + /* only in patch2: unchanged: --- dia-0.95.0.orig/debian/patches/00list +++ dia-0.95.0/debian/patches/00list @@ -0,0 +1 @@ +01-ubuntu-python2.5-segv