r1198 - in zope-textindexng3/trunk/debian (6 files)

[Fabio Tranchitella]

    Date: Thursday, March 6, 2008 @ 15:53:51
  Author: kobold
Revision: 1198

* New upstream release.
* debian/patches/python2.5: applied patch to fix memory issues with
  python2.5, thanks to Thomas Viehmann for providing a patch.
  (Closes: #469010)

Added:
  zope-textindexng3/trunk/debian/patches/
  zope-textindexng3/trunk/debian/patches/00list
  zope-textindexng3/trunk/debian/patches/python2.5
Modified:
  zope-textindexng3/trunk/debian/changelog
  zope-textindexng3/trunk/debian/control
  zope-textindexng3/trunk/debian/rules

Modified: zope-textindexng3/trunk/debian/changelog
===================================================================
--- zope-textindexng3/trunk/debian/changelog	2008-03-06 15:46:29 UTC (rev 1197)
+++ zope-textindexng3/trunk/debian/changelog	2008-03-06 15:53:51 UTC (rev 1198)
@@ -1,3 +1,12 @@
+zope-textindexng3 (1:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/python2.5: applied patch to fix memory issues with
+    python2.5, thanks to Thomas Viehmann for providing a patch.
+    (Closes: #469010)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu, 06 Mar 2008 16:51:07 +0100
+
 zope-textindexng3 (1:3.2.1-1) unstable; urgency=low
 
   * Upload of TextIndexNG3.

Modified: zope-textindexng3/trunk/debian/control
===================================================================
--- zope-textindexng3/trunk/debian/control	2008-03-06 15:46:29 UTC (rev 1197)
+++ zope-textindexng3/trunk/debian/control	2008-03-06 15:53:51 UTC (rev 1198)
@@ -4,7 +4,7 @@
 Maintainer: Debian/Ubuntu Zope team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>, Fabio Tranchitella <kobold at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python (>= 2.3.5-7), python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python (>= 2.3.5-7), python-central (>= 0.5), dpatch
 Build-Depends-Indep: zope-debhelper
 XS-Python-Version: all
 
@@ -24,7 +24,7 @@
 
 Package: zope-textindexng3-lib
 Architecture: any
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}
 XB-Python-Version: ${python:Versions}
 Description: full text index for Zope objects
  TextIndexNG3 is the reimplementation of the well-known TextIndexNG product for

Added: zope-textindexng3/trunk/debian/patches/00list
===================================================================
--- zope-textindexng3/trunk/debian/patches/00list	                        (rev 0)
+++ zope-textindexng3/trunk/debian/patches/00list	2008-03-06 15:53:51 UTC (rev 1198)
@@ -0,0 +1 @@
+python2.5

Added: zope-textindexng3/trunk/debian/patches/python2.5
===================================================================
--- zope-textindexng3/trunk/debian/patches/python2.5	                        (rev 0)
+++ zope-textindexng3/trunk/debian/patches/python2.5	2008-03-06 15:53:51 UTC (rev 1198)
@@ -0,0 +1,64 @@
+--- zope-textindexng3-3.2.1.orig/extension_modules/zopyx/txng3/splitter/splitter.c
++++ zope-textindexng3-3.2.1/extension_modules/zopyx/txng3/splitter/splitter.c
+@@ -149,7 +149,7 @@
+ {
+     hashtable_destroy(self->cache, 1);
+     Py_XDECREF(self->list);
+-    PyMem_DEL(self);
++    PyMem_Del(self);
+ }
+ 
+ 
+@@ -547,7 +547,7 @@
+         return NULL;
+     }
+ 
+-    if (! (self = PyObject_NEW(Splitter, &SplitterType)))
++    if (! (self = PyObject_New(Splitter, &SplitterType)))
+         return NULL;
+ 
+     self->max_len            = max_len;
+only in patch2:
+unchanged:
+--- zope-textindexng3-3.2.1.orig/extension_modules/zopyx/txng3/normalizer/normalizer.c
++++ zope-textindexng3-3.2.1/extension_modules/zopyx/txng3/normalizer/normalizer.c
+@@ -21,7 +21,7 @@
+ Normalizer_dealloc(Normalizer *self)
+ {
+     Py_DECREF(self->table);
+-    PyMem_DEL(self);
++    PyMem_Del(self);
+ }
+ 
+ static PyObject *getTable(Normalizer *self,PyObject *word)
+@@ -247,7 +247,7 @@
+     if (! (PyArg_ParseTupleAndKeywords(args,keywds,"O|s",Normalizer_args,&table,&encoding)))
+         return NULL;
+ 
+-    if (! (self = PyObject_NEW(Normalizer, &NormalizerType)))
++    if (! (self = PyObject_New(Normalizer, &NormalizerType)))
+         return NULL;
+ 
+    if (! checkList(table))
+only in patch2:
+unchanged:
+--- zope-textindexng3-3.2.1.orig/extension_modules/zopyx/txng3/stemmer/stemmer.c
++++ zope-textindexng3-3.2.1/extension_modules/zopyx/txng3/stemmer/stemmer.c
+@@ -25,7 +25,7 @@
+ Stemmer_dealloc (Stemmer * self)
+ {
+   sb_stemmer_delete (self->stemmer);
+-  PyMem_DEL (self);
++  PyObject_Del (self);
+ }
+ 
+ 
+@@ -174,7 +174,7 @@
+   if (!(PyArg_ParseTuple (args, "s", &language)))
+ 	return NULL;
+ 
+-  if (!(self = PyObject_NEW (Stemmer, &StemmerType)))
++  if (!(self = PyObject_New (Stemmer, &StemmerType)))
+ 	return NULL;
+ 
+   self->stemmer = sb_stemmer_new (language, "UTF_8");

Modified: zope-textindexng3/trunk/debian/rules
===================================================================
--- zope-textindexng3/trunk/debian/rules	2008-03-06 15:46:29 UTC (rev 1197)
+++ zope-textindexng3/trunk/debian/rules	2008-03-06 15:53:51 UTC (rev 1198)
@@ -11,7 +11,7 @@
 upstreamname=$(upstreamshort)3
 pkg=zope-textindexng3
 
-build: build-stamp
+build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
 	cd extension_modules; for python in $(PYVERS); do \
@@ -20,7 +20,7 @@
 	done
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -fr build-stamp extension_modules/build
@@ -86,3 +86,4 @@
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
 
+include /usr/share/dpatch/dpatch.make