[Python-modules-commits] r19303 - in packages/pyicu/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, November 13, 2011 @ 00:49:26
  Author: jwilk
Revision: 19303

New upstream version.

Added:
  packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch
Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/patches/00list
  packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2011-11-12 20:40:18 UTC (rev 19302)
+++ packages/pyicu/trunk/debian/changelog	2011-11-13 00:49:26 UTC (rev 19303)
@@ -1,10 +1,16 @@
-pyicu (1.2-1) UNRELEASED; urgency=low
+pyicu (1.3-1) UNRELEASED; urgency=low
 
-  * New upstream version (closes: #628584).
+  [ Bernd Zeimetz ]
   * Migrate to dh_python2 (closes: #635633).
 
- -- Bernd Zeimetz <bzed at debian.org>  Tue, 16 Aug 2011 21:47:25 +0200
+  [ 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.
 
+ -- Jakub Wilk <jwilk at debian.org>  Fri, 11 Nov 2011 15:30:59 +0100
+
 pyicu (1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list	2011-11-12 20:40:18 UTC (rev 19302)
+++ packages/pyicu/trunk/debian/patches/00list	2011-11-13 00:49:26 UTC (rev 19303)
@@ -1,2 +1,3 @@
 no-setuptools-please
 platform-definitions-fix
+ICUtzinfo-not-heap-type

Added: packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch	                        (rev 0)
+++ packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch	2011-11-13 00:49:26 UTC (rev 19303)
@@ -0,0 +1,27 @@
+#! /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;
+         }
+


Property changes on: packages/pyicu/trunk/debian/patches/ICUtzinfo-not-heap-type.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch	2011-11-12 20:40:18 UTC (rev 19302)
+++ packages/pyicu/trunk/debian/patches/platform-definitions-fix.dpatch	2011-11-13 00:49:26 UTC (rev 19303)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## platform-definitions-fix.dpatch by Cyril Brulebois <kibi at debian.org>
+## platform-definitions-fix.dpatch by Jakub Wilk <jwilk at debian.org>
 ##
 ## DP: Fixing FTBFS due to new platform definitions. Setup.py doesn't need to
 ## DP: take care of them in our case.
@@ -7,41 +7,12 @@
 @DPATCH@
 --- pyicu-0.8.1/setup.py
 +++ pyicu-0.8.1+kbsd/setup.py
-@@ -34,25 +31,33 @@
-     'win32': ['icuin', 'icuuc', 'icudt'],
+@@ -42,7 +42,7 @@
  }
  
-+my_platform = sys.platform
-+# Linux is linux2-* on various platforms (#519099):
-+if my_platform.startswith('linux2'):
-+    my_platform = 'linux2'
-+# GNU/kFreeBSD mostly behaves as GNU/Linux for userland:
-+if my_platform.startswith('gnukfreebsd'):
-+    my_platform = 'linux2'
-+
- if 'PYICU_INCLUDES' in os.environ:
-     _includes = os.environ['PYICU_INCLUDES'].split(os.pathsep)
- else:
--    _includes = INCLUDES[sys.platform]
-+    _includes = INCLUDES[my_platform]
+ platform = sys.platform
+-if platform.startswith('linux'):
++if platform.startswith('linux') or platform.startswith('gnukfreebsd'):
+     platform = 'linux'
  
- if 'PYICU_CFLAGS' in os.environ:
-     _cflags = os.environ['PYICU_CFLAGS'].split(os.pathsep)
- else:
--    _cflags = CFLAGS[sys.platform]
-+    _cflags = CFLAGS[my_platform]
- 
- if 'PYICU_LFLAGS' in os.environ:
-     _lflags = os.environ['PYICU_LFLAGS'].split(os.pathsep)
- else:
--    _lflags = LFLAGS[sys.platform]
-+    _lflags = LFLAGS[my_platform]
- 
- if 'PYICU_LIBRARIES' in os.environ:
-     _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
- else:
--    _libraries = LIBRARIES[sys.platform]
-+    _libraries = LIBRARIES[my_platform]
- 
- 
- setup(name="PyICU",
+ if 'PYICU_INCLUDES' in os.environ: