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

[bzed at users.alioth.debian.org]

    Date: Wednesday, December 12, 2007 @ 08:48:55
  Author: bzed
Revision: 3925

* New upstream version.
* debian/patches:
  - Removing 64bit-crash-fix.dpatch as it is included in the new version
    now.

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

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2007-12-10 22:12:59 UTC (rev 3924)
+++ packages/pyicu/trunk/debian/changelog	2007-12-12 08:48:55 UTC (rev 3925)
@@ -1,3 +1,12 @@
+pyicu (0.8.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches:
+    - Removing 64bit-crash-fix.dpatch as it is included in the new version
+      now.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Wed, 12 Dec 2007 09:47:58 +0100
+
 pyicu (0.8-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET

Modified: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list	2007-12-10 22:12:59 UTC (rev 3924)
+++ packages/pyicu/trunk/debian/patches/00list	2007-12-12 08:48:55 UTC (rev 3925)
@@ -1,2 +1 @@
 no-setuptools-please
-64bit-crash-fix

Deleted: packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	2007-12-10 22:12:59 UTC (rev 3924)
+++ packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	2007-12-12 08:48:55 UTC (rev 3925)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 64bit-crash-fix.dpatch by Bernd Zeimetz <bzed at debian.org>
-##
-## DP: Bug fixes for 64bit related crashes.
-## DP: https://bugzilla.osafoundation.org/show_bug.cgi?id=11394
-## DP: r90 of http://svn.osafoundation.org/pyicu/trunk/common.cpp
-
- at DPATCH@
-diff -urNad pyicu~/common.cpp pyicu/common.cpp
---- 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 = PyInt_FromLong((Py_intptr_t) id);
-     PyObject *list = PyList_New(0);
-     PyObject *bn;
- 
-@@ -435,8 +435,8 @@
-         if (id == oid)
-             return 1;
- 
--        PyObject *bn = PyInt_FromLong((long) id);
--        PyObject *n = PyInt_FromLong((long) 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;