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

[bzed at users.alioth.debian.org]

    Date: Thursday, May 10, 2012 @ 20:59:13
  Author: bzed
Revision: 21695

Dropping ICUtzinfo-not-heap-type.dpatch, applied upstream. 

Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/patches/00list
Deleted:
  packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2012-05-10 20:57:59 UTC (rev 21694)
+++ packages/pyicu/trunk/debian/changelog	2012-05-10 20:59:13 UTC (rev 21695)
@@ -6,8 +6,9 @@
 
   [ Bernd Zeimetz ]
   * New upstream version.
+  * Dropping ICUtzinfo-not-heap-type.dpatch, applied upstream. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Thu, 10 May 2012 22:57:49 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 10 May 2012 22:58:53 +0200
 
 pyicu (1.3-1) unstable; urgency=low
 

Modified: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list	2012-05-10 20:57:59 UTC (rev 21694)
+++ packages/pyicu/trunk/debian/patches/00list	2012-05-10 20:59:13 UTC (rev 21695)
@@ -1,3 +1,2 @@
 no-setuptools-please
 platform-definitions-fix
-ICUtzinfo-not-heap-type

Deleted: packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch	2012-05-10 20:57:59 UTC (rev 21694)
+++ packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch	2012-05-10 20:59:13 UTC (rev 21695)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ICUtzinfo-not-heap-type.dpatch by Jakub Wilk <jwilk at debian.org>
-##
-## DP: Revert upstream change to make ICUtzinfo a heap type.
-## DP: See https://bugzilla.osafoundation.org/show_bug.cgi?id=13038
-
-diff --git a/tzinfo.cpp b/tzinfo.cpp
---- a/tzinfo.cpp
-+++ b/tzinfo.cpp
-@@ -122,7 +122,6 @@
-     0,                                  /* tp_setattro */
-     0,                                  /* tp_as_buffer */
-     (Py_TPFLAGS_DEFAULT |
--     Py_TPFLAGS_HEAPTYPE |
-      Py_TPFLAGS_BASETYPE),              /* tp_flags */
-     "",                                 /* tp_doc */
-     0,                                  /* tp_traverse */
-@@ -445,7 +444,7 @@
- 
-             Py_XDECREF((PyObject *) _default);
-             _default = (t_tzinfo *) tzinfo;
--            PyObject_SetAttrString((PyObject *)&TZInfoType, "default", tzinfo);
-+            PyDict_SetItemString(TZInfoType.tp_dict, "default", tzinfo);
- 
-             Py_RETURN_NONE;
-         }
-