r2208 - in zope.interface/trunk/debian (6 files)

[jinty-guest at users.alioth.debian.org]

    Date: Saturday, April 30, 2011 @ 17:07:50
  Author: jinty-guest
Revision: 2208

* Backport fixes to C optimizationd from upstream LP: #675064. Reportedly
  causes a segfault on python3 and 64-bit architectures.
* Switch to dpkg-source 3.0 (quilt) format

Added:
  zope.interface/trunk/debian/patches/
  zope.interface/trunk/debian/patches/fix_segfault_py3_64bit_LP_675064.diff
  zope.interface/trunk/debian/patches/series
  zope.interface/trunk/debian/source/
  zope.interface/trunk/debian/source/format
Modified:
  zope.interface/trunk/debian/changelog

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2011-04-30 17:04:36 UTC (rev 2207)
+++ zope.interface/trunk/debian/changelog	2011-04-30 17:07:50 UTC (rev 2208)
@@ -1,8 +1,11 @@
 zope.interface (3.6.1-2) unstable; urgency=low
 
   * Add testing scripts for python3 version of this package.
+  * Backport fixes to C optimizationd from upstream LP: #675064. Reportedly
+    causes a segfault on python3 and 64-bit architectures.
+  * Switch to dpkg-source 3.0 (quilt) format
 
- -- Brian Sutherland <brian at vanguardistas.net>  Thu, 28 Apr 2011 16:38:22 +0200
+ -- Brian Sutherland <brian at vanguardistas.net>  Fri, 29 Apr 2011 08:35:40 +0200
 
 zope.interface (3.6.1-1) unstable; urgency=low
 

Added: zope.interface/trunk/debian/patches/fix_segfault_py3_64bit_LP_675064.diff
===================================================================
--- zope.interface/trunk/debian/patches/fix_segfault_py3_64bit_LP_675064.diff	                        (rev 0)
+++ zope.interface/trunk/debian/patches/fix_segfault_py3_64bit_LP_675064.diff	2011-04-30 17:07:50 UTC (rev 2208)
@@ -0,0 +1,48 @@
+Backport of 118418 from upstream. Included in 3.6.2 and above. Original change:
+
+ - LP # 675064:  Specify return value type for C optimizations module init 
+   under Python 3:  undeclared value caused warnings, and segfaults on some 
+   64 bit architectures.
+
+--- a/src/zope/interface/_zope_interface_coptimizations.c
++++ b/src/zope/interface/_zope_interface_coptimizations.c
+@@ -1565,8 +1565,7 @@
+ };
+ 
+ #if  PY_MAJOR_VERSION >= 3
+-static char module_doc[] = "C optimizations for zope.interface\n\n"
+-  "$Id: _zope_interface_coptimizations.c 111871 2010-05-02 17:19:14Z tseaver $";
++static char module_doc[] = "C optimizations for zope.interface\n\n";
+ 
+ static struct PyModuleDef _zic_module = {
+ 	PyModuleDef_HEAD_INIT,
+@@ -1581,9 +1580,6 @@
+ };
+ #endif
+ 
+-#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+-#define PyMODINIT_FUNC void
+-#endif
+ static PyObject *
+ init(void)
+ {
+@@ -1646,8 +1642,7 @@
+   #if PY_MAJOR_VERSION < 3
+   /* Create the module and add the functions */
+   m = Py_InitModule3("_zope_interface_coptimizations", m_methods,
+-                     "C optimizations for zope.interface\n\n"
+-                     "$Id: _zope_interface_coptimizations.c 111871 2010-05-02 17:19:14Z tseaver $");
++                     "C optimizations for zope.interface\n\n");
+   #else
+   m = PyModule_Create(&_zic_module);
+   #endif
+@@ -1673,8 +1668,8 @@
+   return m;
+ }
+ 
+-#if PY_MAJOR_VERSION < 3
+ PyMODINIT_FUNC
++#if PY_MAJOR_VERSION < 3
+ init_zope_interface_coptimizations(void)
+ {
+   init();

Added: zope.interface/trunk/debian/patches/series
===================================================================
--- zope.interface/trunk/debian/patches/series	                        (rev 0)
+++ zope.interface/trunk/debian/patches/series	2011-04-30 17:07:50 UTC (rev 2208)
@@ -0,0 +1 @@
+fix_segfault_py3_64bit_LP_675064.diff

Added: zope.interface/trunk/debian/source/format
===================================================================
--- zope.interface/trunk/debian/source/format	                        (rev 0)
+++ zope.interface/trunk/debian/source/format	2011-04-30 17:07:50 UTC (rev 2208)
@@ -0,0 +1 @@
+3.0 (quilt)