[Python-modules-commits] r3894 - in packages/pyicu/trunk/debian (3 files)

[bzed at users.alioth.debian.org]

    Date: Thursday, December 6, 2007 @ 21:46:26
  Author: bzed
Revision: 3894

* debian/patches:
  - Updating 64bit-crash-fix.dpatch as upstream found another part of code
    which could result into segfaults on 64bit architectures.
* debian/control:
  - Updating Standards-Version to 3.7.3.

Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/control
  packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2007-12-06 21:06:41 UTC (rev 3893)
+++ packages/pyicu/trunk/debian/changelog	2007-12-06 21:46:26 UTC (rev 3894)
@@ -1,3 +1,13 @@
+pyicu (0.8-3) unstable; urgency=low
+
+  * debian/patches:
+    - Updating 64bit-crash-fix.dpatch as upstream found another part of code
+      which could result into segfaults on 64bit architectures.
+  * debian/control:
+    - Updating Standards-Version to 3.7.3.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 06 Dec 2007 22:45:38 +0100
+
 pyicu (0.8-2) unstable; urgency=low
 
   * debian/patches: 

Modified: packages/pyicu/trunk/debian/control
===================================================================
--- packages/pyicu/trunk/debian/control	2007-12-06 21:06:41 UTC (rev 3893)
+++ packages/pyicu/trunk/debian/control	2007-12-06 21:46:26 UTC (rev 3894)
@@ -8,7 +8,7 @@
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyicu/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyicu/trunk/
 Homepage: http://pyicu.osafoundation.org/
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: python-pyicu
 Architecture: any

Modified: packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	2007-12-06 21:06:41 UTC (rev 3893)
+++ packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	2007-12-06 21:46:26 UTC (rev 3894)
@@ -7,42 +7,51 @@
 
 @DPATCH@
 diff -urNad pyicu~/common.cpp pyicu/common.cpp
---- pyicu~/common.cpp	2007-11-24 20:57:20.000000000 +0100
-+++ pyicu/common.cpp	2007-12-06 00:39:59.000000000 +0100
-@@ -409,7 +409,13 @@
+--- pyicu~/common.cpp	2007-12-06 22:43:17.000000000 +0100
++++ pyicu/common.cpp	2007-12-06 22:43:22.000000000 +0100
+@@ -409,7 +409,7 @@
  
  void registerType(PyTypeObject *type, UClassID id)
  {
 -    PyObject *n = PyInt_FromLong((long) id);
-+    PyObject *n;
-+
-+    if (sizeof(void *) == sizeof(int))
-+        n = PyInt_FromLong((Py_intptr_t) id);
-+    else
-+        n = PyLong_FromLongLong((Py_intptr_t) id);
-+
++    PyObject *n = PyInt_FromLong((Py_intptr_t) id);
      PyObject *list = PyList_New(0);
      PyObject *bn;
  
-@@ -435,8 +441,19 @@
+@@ -435,8 +435,8 @@
          if (id == oid)
              return 1;
  
 -        PyObject *bn = PyInt_FromLong((long) id);
 -        PyObject *n = PyInt_FromLong((long) oid);
-+	PyObject *bn, *n;
-+
-+	if (sizeof(void *) == sizeof(int))
-+	{
-+	    bn = PyInt_FromLong((Py_intptr_t) id);
-+	    n = PyInt_FromLong((Py_intptr_t) oid);
-+	}
-+	else
-+	{
-+	    bn = PyLong_FromLongLong((Py_intptr_t) id);
-+	    n = PyLong_FromLongLong((Py_intptr_t) oid);
-+	}
-+
++        PyObject *bn = PyInt_FromLong((Py_intptr_t) id);
++        PyObject *n = PyInt_FromLong((Py_intptr_t) oid);
          PyObject *list = PyDict_GetItem(types, bn);
          int b = PySequence_Contains(list, n);
          
+@@ -454,8 +454,7 @@
+     if (PySequence_Check(arg))
+     {
+         *len = PySequence_Size(arg);
+-        UObject **array = (UObject **)
+-            calloc(*len, sizeof(UObject *));
++        UObject **array = (UObject **) calloc(*len, sizeof(UObject *));
+ 
+         for (int i = 0; i < *len; i++) {
+             PyObject *obj = PySequence_GetItem(arg, i);
+@@ -933,13 +932,13 @@
+ 
+           case 'R':           /* array of wrapped ICU objects */
+           {
+-	      typedef UObject *(*convFn)(PyObject *, int *,
++              typedef UObject *(*convFn)(PyObject *, int *,
+                                          UClassID, PyTypeObject *);
+               UObject **array = va_arg(list, UObject **);
+               int *len = va_arg(list, int *);
+               UClassID id = va_arg(list, UClassID);
+               PyTypeObject *type = va_arg(list, PyTypeObject *);
+-	      convFn fn = va_arg(list, convFn);
++              convFn fn = va_arg(list, convFn);
+               *array = fn(arg, len, id, type);
+               if (!*array)
+                   return -1;