Merge lp:~james-page/ubuntu/natty/mod-wsgi/fix-749720 into lp:ubuntu/natty/mod-wsgi

[James Page]

Updates to support python >= 3.2

PyCObject_FromVoidPtr is no longer present in python 3.2+; patch created from upstream trunk to use correct function for 3.2+.

Minor update to py3.postinst to correctly detect default python3 version.

[lp:~james-page/ubuntu/natty/mod-wsgi/fix-749720]

17. By James Page on 2011-04-07

Converted to source/format "3.0 (quilt)" and updated debhelper
version (>= 7.0.15).

18. By James Page on 2011-04-07

Updated patch Author->Origiin

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-03 00:04:55 +0000
+++ debian/changelog	2011-04-07 11:37:45 +0000
@@ -1,3 +1,14 @@
+mod-wsgi (3.3-2ubuntu1) natty; urgency=low
+
+  * Updates to support python >= 3.2 (LP: #749720):
+    - Picked patch to support python >= 3.2 from upstream trunk.
+    - Fixed libapache2-mod-wsgi-py3.postinst to correctly detect 
+      default python 3 version. 
+  * Converted to source/format "3.0 (quilt)" and updated debhelper
+    version (>= 7.0.15).
+
+ -- James Page <[e-mail]>  Thu, 07 Apr 2011 11:25:17 +0100
+
 mod-wsgi (3.3-2build1) natty; urgency=low
 
   * Rebuild to add support for python 2.7.

=== modified file 'debian/control'
--- debian/control	2010-08-18 23:40:10 +0000
+++ debian/control	2011-04-07 11:37:45 +0000
@@ -1,9 +1,10 @@
 Source: mod-wsgi
 Section: httpd
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Bernd Zeimetz <[e-mail]>, Piotr Ożarowski <[e-mail]>
-Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-threaded-dev
+Build-Depends: debhelper (>= 7.0.15), python-all-dev, python3-all-dev, apache2-threaded-dev
 Homepage: http://www.modwsgi.org/
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/mod-wsgi/trunk/

=== modified file 'debian/libapache2-mod-wsgi-py3.postinst'
--- debian/libapache2-mod-wsgi-py3.postinst	2010-08-18 23:40:10 +0000
+++ debian/libapache2-mod-wsgi-py3.postinst	2011-04-07 11:37:45 +0000
@@ -14,7 +14,7 @@
 
 update_symlink() {
     wsgi_py=`readlink /usr/lib/apache2/modules/mod_wsgi.so | sed 's,.*-,,'`
-    py3_default=`dpkg -s python3 | grep '^Version' | sed 's,Version: \([^.]*.[^.]*\).*,\1,'`
+    py3_default=`dpkg -s python3 | grep '^Version' | sed 's,Version: \([^.]*.[^.]\).*,\1,'`
     if [ ! "${wsgi_py}" = "${py3_default}" ]; then
         ln -sf mod_wsgi.so-${py3_default} /usr/lib/apache2/modules/mod_wsgi.so
     fi

=== added directory 'debian/patches'
=== added file 'debian/patches/fix-python-3.2-lp-749720.patch'
--- debian/patches/fix-python-3.2-lp-749720.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-python-3.2-lp-749720.patch	2011-04-07 11:37:45 +0000
@@ -0,0 +1,46 @@
+Description: Updates to support python >= 3.2 which has removed 
+ PyCObject_FromVoidPtr function. This was created from upstream 
+ trunk and can probably be dropped for the next upstream release.
+Origin: http://modwsgi.googlecode.com/svn/trunk/mod_wsgi/mod_wsgi.c
+Bug: https://bugs.launchpad.net/ubuntu/+source/mod-wsgi/+bug/749720
+Forwarded: not-needed
+Index: mod-wsgi/mod_wsgi.c
+===================================================================
+--- mod-wsgi.orig/mod_wsgi.c	2011-04-07 11:22:04.559450923 +0100
++++ mod-wsgi/mod_wsgi.c	2011-04-07 11:24:51.498949793 +0100
+@@ -3598,7 +3598,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }
+@@ -8369,7 +8373,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }
+@@ -13372,7 +13380,11 @@
+      */
+ 
+     if (!wsgi_daemon_pool && self->config->pass_apache_request) {
++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
++        object = PyCapsule_New(self->r, 0, 0);
++#else
+         object = PyCObject_FromVoidPtr(self->r, 0);
++#endif
+         PyDict_SetItemString(vars, "apache.request_rec", object);
+         Py_DECREF(object);
+     }

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-04-07 11:37:45 +0000
@@ -0,0 +1,1 @@
+fix-python-3.2-lp-749720.patch

=== modified file 'debian/source/format'
--- debian/source/format	2010-05-12 18:12:36 +0000
+++ debian/source/format	2011-04-07 11:37:45 +0000
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)