← Back to branch summary

~barcc/ubuntu/saucy/pyicu/lp1200419

« back to all changes in this revision

Viewing changes to debian/patches/ICUtzinfo-not-heap-type.dpatch

  • Committer: Package Import Robot
  • Author(s): Jakub Wilk, Bernd Zeimetz, Jakub Wilk
  • Date: 2011-11-13 12:07:46 UTC
  • mfrom: (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20111113120746-20jj2w42dzz6xozt
Tags: 1.3-1
http://bugs.debian.org/635633
http://bugs.debian.org/628584
* Team upload.

[ Bernd Zeimetz ]
* Migrate to dh_python2 (closes: #635633).

[ Jakub Wilk ]
* New upstream version.
  + Fix compatiblity with ICU 4.8 (closes: #628584).
  + Rewrite platform-definitions-fix.dpatch from scratch.
  + Revert upstream change to make ICUtzinfo a heap type.
* Bump standards version to 3.9.2 (no changes needed).
* Don't override shared library dependency information for libpython2.X; the
  exension modules aren't linked to it anyway.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ICUtzinfo-not-heap-type.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## ICUtzinfo-not-heap-type.dpatch by Jakub Wilk <jwilk@debian.org>
 
3
##
 
4
## DP: Revert upstream change to make ICUtzinfo a heap type.
 
5
## DP: See https://bugzilla.osafoundation.org/show_bug.cgi?id=13038
 
6
 
 
7
diff --git a/tzinfo.cpp b/tzinfo.cpp
 
8
--- a/tzinfo.cpp
 
9
+++ b/tzinfo.cpp
 
10
@@ -122,7 +122,6 @@
 
11
     0,                                  /* tp_setattro */
 
12
     0,                                  /* tp_as_buffer */
 
13
     (Py_TPFLAGS_DEFAULT |
 
14
-     Py_TPFLAGS_HEAPTYPE |
 
15
      Py_TPFLAGS_BASETYPE),              /* tp_flags */
 
16
     "",                                 /* tp_doc */
 
17
     0,                                  /* tp_traverse */
 
18
@@ -445,7 +444,7 @@
 
19
 
 
20
             Py_XDECREF((PyObject *) _default);
 
21
             _default = (t_tzinfo *) tzinfo;
 
22
-            PyObject_SetAttrString((PyObject *)&TZInfoType, "default", tzinfo);
 
23
+            PyDict_SetItemString(TZInfoType.tp_dict, "default", tzinfo);
 
24
 
 
25
             Py_RETURN_NONE;
 
26
         }
 
27