diff -Nru reportlab-accel-0.60-20061203/debian/changelog reportlab-accel-0.61-20080128/debian/changelog --- reportlab-accel-0.60-20061203/debian/changelog 2008-06-27 18:55:31.000000000 -0500 +++ reportlab-accel-0.61-20080128/debian/changelog 2008-06-27 18:55:32.000000000 -0500 @@ -1,3 +1,25 @@ +reportlab-accel (0.61-20080128-1.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #243654): + - Build a python-reportlab-accel-dbg package. + - Set Ubuntu maintainer address. + + -- Nathan Handler Fri, 27 Jun 2008 18:45:17 -0500 + +reportlab-accel (0.61-20080128-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix mismatched Python API memory handling calls. + Closes: #469002 + + -- Thomas Viehmann Wed, 05 Mar 2008 22:52:16 +0100 + +reportlab-accel (0.61-20080128-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 28 Jan 2008 21:20:34 +0100 + reportlab-accel (0.60-20061203-2ubuntu1) feisty; urgency=low * Build a python-reportlab-accel-dbg package. diff -Nru reportlab-accel-0.60-20061203/debian/control reportlab-accel-0.61-20080128/debian/control --- reportlab-accel-0.60-20061203/debian/control 2008-06-27 18:55:31.000000000 -0500 +++ reportlab-accel-0.61-20080128/debian/control 2008-06-27 18:55:32.000000000 -0500 @@ -5,11 +5,11 @@ XSBC-Original-Maintainer: Matthias Klose Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-central XS-Python-Version: all -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: python-reportlab-accel Architecture: any -Depends: python-reportlab (>= 2.0), ${python:Depends}, ${shlibs:Depends} +Depends: python-reportlab (>= 2.1), ${python:Depends}, ${shlibs:Depends} Conflicts: python2.3-reportlab-accel, python2.4-reportlab-accel Replaces: python2.3-reportlab-accel, python2.4-reportlab-accel Provides: ${python:Provides} diff -Nru reportlab-accel-0.60-20061203/MANIFEST.txt reportlab-accel-0.61-20080128/MANIFEST.txt --- reportlab-accel-0.60-20061203/MANIFEST.txt 2006-12-03 02:21:57.000000000 -0600 +++ reportlab-accel-0.61-20080128/MANIFEST.txt 2008-01-28 02:22:34.000000000 -0600 @@ -1,9 +1,10 @@ -#signed /tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.60-20061203/MANIFEST.txt for rl_accel-0.60-daily-unix in /usr/home/rptlab2/tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.60-20061203 generated on qs385.pair.com at Sun Dec 3 03:21:57 2006 +#signed /tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.61-20080128/MANIFEST.txt for rl_accel-0.61-daily-unix in /usr/home/rptlab2/tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.61-20080128 generated on qs385.pair.com at Mon Jan 28 03:22:34 2008 +rl_accel/MANIFEST.in 2ca6e910fe5dcb1a1006f0d7a55b38ec rl_accel/Makefile.pre.in 42bfb3d6ebbe2c95118c2d1a7727084b rl_accel/README.extensions f2e0366a6d013e793d7be3dd32e47329 rl_accel/Setup.in 939171cff72f5e166de0122b79961f0b rl_accel/__BUILD.dsw 94e5ae7dc2cab3fb703c648fc454fa11 -rl_accel/_rl_accel.c d4df0728ff04c18b9d2033e1b6427cbf # 2994 2006-10-25 18:14:06Z +rl_accel/_rl_accel.c 45837c4dde9a871ce3d6020bb30481bc # 3188 2007-11-25 10:10:31Z rl_accel/_rl_accel.dsp e54dec4fb668a776dfa2ea5e3b267c14 rl_accel/_rl_accel.java 81957aaaeea3f99ff3dbf66542f14892 rl_accel/hnjalloc.c 5096f7b0bfb7b95d484aba1aed41bd6f @@ -12,9 +13,9 @@ rl_accel/hyphen.h 07646c8d4624207244ebe4bf16a8c3d0 rl_accel/hyphen.mashed 1c257f62bf805cff09661d1ea4affc84 rl_accel/pyHnj.dsp 548384d5fe0fee004cf1de3c78e510ce -rl_accel/pyHnjmodule.c 9f9aedc6e5131db2ad3e5da999a0c425 +rl_accel/pyHnjmodule.c 89ef7e4768c538d5f9116e2f7c137ab8 rl_accel/setup.py 50be6694950ee00e9d9484796286a7fe -rl_accel/sgmlop.c e8bfe00aeea4c1cda795257593586e4f # 2958 2006-08-17 16:30:10Z +rl_accel/sgmlop.c da6c22efaa2df637992fc9923355dce2 # 3203 2008-01-03 11:22:24Z rl_accel/sgmlop.dsp 1c30b23f77f54d54abaec8f7636664f2 rl_accel/tests/getrc.py e824f83802d2358383fd504567412e75 rl_accel/tests/t0.py a78da97107ea75953284ebadaef3c4b7 @@ -23,4 +24,4 @@ rl_accel/tests/t3.py d6e9061d669d502e6e82ed3acaedaa66 rl_accel/tests/t4.py d15a8ce3d7571556b9156b7cbe14e681 rl_accel/tests/t5.py bc598752d9934736b8246c0979adc80f -/tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.60-20061203/MANIFEST.txt bdbf21930ce66812ad1fb816d41a0d0d \ No newline at end of file +/tmp/ReportLab_tmp/rlbuild_area/dist/rl_accel-0.61-20080128/MANIFEST.txt 40e1a9951455cadbd65560b59044be3c \ No newline at end of file diff -Nru reportlab-accel-0.60-20061203/rl_accel/MANIFEST.in reportlab-accel-0.61-20080128/rl_accel/MANIFEST.in --- reportlab-accel-0.60-20061203/rl_accel/MANIFEST.in 1969-12-31 18:00:00.000000000 -0600 +++ reportlab-accel-0.61-20080128/rl_accel/MANIFEST.in 2007-07-24 08:07:54.000000000 -0500 @@ -0,0 +1 @@ +include *.h diff -Nru reportlab-accel-0.60-20061203/rl_accel/pyHnjmodule.c reportlab-accel-0.61-20080128/rl_accel/pyHnjmodule.c --- reportlab-accel-0.60-20061203/rl_accel/pyHnjmodule.c 2006-10-10 02:14:13.000000000 -0500 +++ reportlab-accel-0.61-20080128/rl_accel/pyHnjmodule.c 2007-11-26 02:18:00.000000000 -0600 @@ -215,20 +215,22 @@ if (self == NULL) return NULL; - if((self->hdict = hnj_hyphen_load(filename)) == NULL) - return NULL; /* We want to raise a more descriptive error. */ + if((self->hdict = hnj_hyphen_load(filename)) == NULL){ + PyErr_Format(PyExc_IOError,"Failed to load hyphenization information from \"%s\"", filename); + Py_DECREF(self); + return NULL; + } return self; } - static void Hyphen_dealloc(Hyphenobject *self) { if (self->hdict != NULL) { hnj_hyphen_free(self->hdict); self->hdict = NULL; } - PyMem_DEL(self); + PyObject_DEL(self); } static PyObject * diff -Nru reportlab-accel-0.60-20061203/rl_accel/_rl_accel.c reportlab-accel-0.61-20080128/rl_accel/_rl_accel.c --- reportlab-accel-0.60-20061203/rl_accel/_rl_accel.c 2008-06-27 18:55:31.000000000 -0500 +++ reportlab-accel-0.61-20080128/rl_accel/_rl_accel.c 2008-06-27 18:55:32.000000000 -0500 @@ -1,10 +1,12 @@ -/**************************************************************************** -#Copyright ReportLab Europe Ltd. 2000-2004 -#see license.txt for license details -#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/lib/_rl_accel.c - ****************************************************************************/ +/* +* Copyright ReportLab Europe Ltd. 2000-2007 +* licensed under the same terms as the ReportLab Toolkit +* see http://www.reportlab.co.uk/svn/public/reportlab/trunk/reportlab/license.txt +* for details. +* history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/lib/_rl_accel.c +*/ #if 0 -static __version__=" $Id: _rl_accel.c 2994 2006-10-25 18:14:06Z rgbecker $ " +static __version__=" $Id: _rl_accel.c 3188 2007-11-25 10:10:31Z rgbecker $ " #endif #include "Python.h" #include @@ -27,7 +29,7 @@ #ifndef min # define min(a,b) ((a)<(b)?(a):(b)) #endif -#define VERSION "0.60" +#define VERSION "0.61" #define MODULE "_rl_accel" static PyObject *moduleVersion; @@ -1358,7 +1360,7 @@ static void BoxFree(BoxObject* self) { - PyMem_DEL(self); + PyObject_Del(self); } static int Box_set_int(char* name, int* pd, PyObject *value) @@ -1490,7 +1492,7 @@ double w; if(!PyArg_ParseTupleAndKeywords(args,kw,"d|O:Box",kwlist,&w,&pC)) return NULL; - if(!(self = PyObject_NEW(BoxObject, &BoxType))) return NULL; + if(!(self = PyObject_New(BoxObject, &BoxType))) return NULL; self->shrink = self->stretch = self->penalty = (double)(self->is_glue = self->is_penalty = self->flagged = 0); self->is_box = 1; self->width = w; diff -Nru reportlab-accel-0.60-20061203/rl_accel/sgmlop.c reportlab-accel-0.61-20080128/rl_accel/sgmlop.c --- reportlab-accel-0.60-20061203/rl_accel/sgmlop.c 2006-10-10 02:14:13.000000000 -0500 +++ reportlab-accel-0.61-20080128/rl_accel/sgmlop.c 2008-01-04 02:14:26.000000000 -0600 @@ -1,6 +1,6 @@ /* * SGMLOP - * $Id: sgmlop.c 2958 2006-08-17 16:30:10Z rgbecker $ + * $Id: sgmlop.c 3203 2008-01-03 11:22:24Z rptlab $ * * The sgmlop accelerator module * @@ -52,6 +52,11 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "Python.h" +#if PY_VERSION_HEX < 0x02050000 +# define Py_ssize_t int +# define lenfunc inquiry +# define ssizeargfunc intargfunc +#endif #include @@ -560,7 +565,7 @@ } static PyObject* -element_getitem(ElementObject* self, int index) +element_getitem(ElementObject* self, Py_ssize_t index) { if (index < 0 || index >= self->child_count) { PyErr_SetString(PyExc_IndexError, "child index out of range"); @@ -571,7 +576,7 @@ return self->children[index]; } -static int +static Py_ssize_t element_length(ElementObject* self) { return self->child_count; @@ -674,10 +679,10 @@ } static PySequenceMethods element_as_sequence = { - (inquiry) element_length, /* sq_length */ + (lenfunc) element_length, /* sq_length */ 0, /* sq_concat */ 0, /* sq_repeat */ - (intargfunc) element_getitem, /* sq_item */ + (ssizeargfunc) element_getitem, /* sq_item */ 0, /* sq_slice */ 0, /* sq_ass_item */ 0, /* sq_ass_slice */