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

Proposed by James Page on 2011-04-07
Status: Merged
Merged at revision: 16
Proposed branch: lp:~james-page/ubuntu/natty/mod-wsgi/fix-749720
Merge into: lp:ubuntu/natty/mod-wsgi
Diff against target: 113 lines (+63/-4)
6 files modified
debian/changelog (+11/-0)
debian/control (+3/-2)
debian/libapache2-mod-wsgi-py3.postinst (+1/-1)
debian/patches/fix-python-3.2-lp-749720.patch (+46/-0)
debian/patches/series (+1/-0)
debian/source/format (+1/-1)
To merge this branch: bzr merge lp:~james-page/ubuntu/natty/mod-wsgi/fix-749720
Reviewer Review Type Date Requested Status
Dave Walker 2011-04-07 Pending
Review via email: mp+56721@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-03 00:04:55 +0000
3+++ debian/changelog 2011-04-07 11:37:45 +0000
4@@ -1,3 +1,14 @@
5+mod-wsgi (3.3-2ubuntu1) natty; urgency=low
6+
7+ * Updates to support python >= 3.2 (LP: #749720):
8+ - Picked patch to support python >= 3.2 from upstream trunk.
9+ - Fixed libapache2-mod-wsgi-py3.postinst to correctly detect
10+ default python 3 version.
11+ * Converted to source/format "3.0 (quilt)" and updated debhelper
12+ version (>= 7.0.15).
13+
14+ -- James Page <james.page@canonical.com> Thu, 07 Apr 2011 11:25:17 +0100
15+
16 mod-wsgi (3.3-2build1) natty; urgency=low
17
18 * Rebuild to add support for python 2.7.
19
20=== modified file 'debian/control'
21--- debian/control 2010-08-18 23:40:10 +0000
22+++ debian/control 2011-04-07 11:37:45 +0000
23@@ -1,9 +1,10 @@
24 Source: mod-wsgi
25 Section: httpd
26 Priority: optional
27-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
28+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
29+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
30 Uploaders: Bernd Zeimetz <bzed@debian.org>, Piotr O┼╝arowski <piotr@debian.org>
31-Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-threaded-dev
32+Build-Depends: debhelper (>= 7.0.15), python-all-dev, python3-all-dev, apache2-threaded-dev
33 Homepage: http://www.modwsgi.org/
34 Standards-Version: 3.9.1
35 Vcs-Svn: svn://svn.debian.org/python-modules/packages/mod-wsgi/trunk/
36
37=== modified file 'debian/libapache2-mod-wsgi-py3.postinst'
38--- debian/libapache2-mod-wsgi-py3.postinst 2010-08-18 23:40:10 +0000
39+++ debian/libapache2-mod-wsgi-py3.postinst 2011-04-07 11:37:45 +0000
40@@ -14,7 +14,7 @@
41
42 update_symlink() {
43 wsgi_py=`readlink /usr/lib/apache2/modules/mod_wsgi.so | sed 's,.*-,,'`
44- py3_default=`dpkg -s python3 | grep '^Version' | sed 's,Version: \([^.]*.[^.]*\).*,\1,'`
45+ py3_default=`dpkg -s python3 | grep '^Version' | sed 's,Version: \([^.]*.[^.]\).*,\1,'`
46 if [ ! "${wsgi_py}" = "${py3_default}" ]; then
47 ln -sf mod_wsgi.so-${py3_default} /usr/lib/apache2/modules/mod_wsgi.so
48 fi
49
50=== added directory 'debian/patches'
51=== added file 'debian/patches/fix-python-3.2-lp-749720.patch'
52--- debian/patches/fix-python-3.2-lp-749720.patch 1970-01-01 00:00:00 +0000
53+++ debian/patches/fix-python-3.2-lp-749720.patch 2011-04-07 11:37:45 +0000
54@@ -0,0 +1,46 @@
55+Description: Updates to support python >= 3.2 which has removed
56+ PyCObject_FromVoidPtr function. This was created from upstream
57+ trunk and can probably be dropped for the next upstream release.
58+Origin: http://modwsgi.googlecode.com/svn/trunk/mod_wsgi/mod_wsgi.c
59+Bug: https://bugs.launchpad.net/ubuntu/+source/mod-wsgi/+bug/749720
60+Forwarded: not-needed
61+Index: mod-wsgi/mod_wsgi.c
62+===================================================================
63+--- mod-wsgi.orig/mod_wsgi.c 2011-04-07 11:22:04.559450923 +0100
64++++ mod-wsgi/mod_wsgi.c 2011-04-07 11:24:51.498949793 +0100
65+@@ -3598,7 +3598,11 @@
66+ */
67+
68+ if (!wsgi_daemon_pool && self->config->pass_apache_request) {
69++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
70++ object = PyCapsule_New(self->r, 0, 0);
71++#else
72+ object = PyCObject_FromVoidPtr(self->r, 0);
73++#endif
74+ PyDict_SetItemString(vars, "apache.request_rec", object);
75+ Py_DECREF(object);
76+ }
77+@@ -8369,7 +8373,11 @@
78+ */
79+
80+ if (!wsgi_daemon_pool && self->config->pass_apache_request) {
81++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
82++ object = PyCapsule_New(self->r, 0, 0);
83++#else
84+ object = PyCObject_FromVoidPtr(self->r, 0);
85++#endif
86+ PyDict_SetItemString(vars, "apache.request_rec", object);
87+ Py_DECREF(object);
88+ }
89+@@ -13372,7 +13380,11 @@
90+ */
91+
92+ if (!wsgi_daemon_pool && self->config->pass_apache_request) {
93++#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 2
94++ object = PyCapsule_New(self->r, 0, 0);
95++#else
96+ object = PyCObject_FromVoidPtr(self->r, 0);
97++#endif
98+ PyDict_SetItemString(vars, "apache.request_rec", object);
99+ Py_DECREF(object);
100+ }
101
102=== added file 'debian/patches/series'
103--- debian/patches/series 1970-01-01 00:00:00 +0000
104+++ debian/patches/series 2011-04-07 11:37:45 +0000
105@@ -0,0 +1,1 @@
106+fix-python-3.2-lp-749720.patch
107
108=== modified file 'debian/source/format'
109--- debian/source/format 2010-05-12 18:12:36 +0000
110+++ debian/source/format 2011-04-07 11:37:45 +0000
111@@ -1,1 +1,1 @@
112-1.0
113+3.0 (quilt)

Subscribers

People subscribed via source and target branches

to all changes: