[Python-modules-commits] r24436 - in packages/mod-wsgi/trunk/debian (11 files)
fgeyer at users.alioth.debian.org
fgeyer at users.alioth.debian.org
Sun May 19 11:22:43 UTC 2013
Date: Sunday, May 19, 2013 @ 11:22:41
Author: fgeyer
Revision: 24436
Add support for Apache 2.4. Thanks to Ond?\197?\153ej Sur?\195?\189 for the patch.
(Closes: #666818)
Added:
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.apache2
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.apache2
Modified:
packages/mod-wsgi/trunk/debian/changelog
packages/mod-wsgi/trunk/debian/control
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.postinst
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
packages/mod-wsgi/trunk/debian/rules
Deleted:
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.prerm
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm
Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================
--- packages/mod-wsgi/trunk/debian/changelog 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/changelog 2013-05-19 11:22:41 UTC (rev 24436)
@@ -8,6 +8,8 @@
initial patch. (Closes: #692390)
- Add python-config.patch to make configure.ac query pythonX.Y-config
instead of python-distutils.
+ * Add support for Apache 2.4. Thanks to Ondřej Surý for the patch.
+ (Closes: #666818)
-- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:01:16 +0200
Modified: packages/mod-wsgi/trunk/debian/control
===================================================================
--- packages/mod-wsgi/trunk/debian/control 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/control 2013-05-19 11:22:41 UTC (rev 24436)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bzed at debian.org>, Piotr Ożarowski <piotr at debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-threaded-dev, dh-autoreconf
+Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-dev (>= 2.4), dh-autoreconf
Homepage: http://www.modwsgi.org/
Standards-Version: 3.9.2
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/mod-wsgi/trunk/
@@ -11,8 +11,7 @@
Package: libapache2-mod-wsgi
Architecture: any
-Depends: apache2, apache2.2-common, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Suggests: apache2-mpm-worker | apache2-mpm-event
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: httpd-wsgi
Description: Python WSGI adapter module for Apache
The mod_wsgi adapter is an Apache module that provides a WSGI (Web Server
@@ -25,8 +24,7 @@
Package: libapache2-mod-wsgi-py3
Architecture: any
-Depends: apache2, apache2.2-common, ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
-Suggests: apache2-mpm-worker | apache2-mpm-event
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
Conflicts: libapache2-mod-wsgi
Provides: httpd-wsgi
Description: Python 3 WSGI adapter module for Apache
Added: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.apache2
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.apache2 (rev 0)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.apache2 2013-05-19 11:22:41 UTC (rev 24436)
@@ -0,0 +1,2 @@
+mod debian/wsgi.load
+mod debian/wsgi.conf
Deleted: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install 2013-05-19 11:22:41 UTC (rev 24436)
@@ -1,2 +0,0 @@
-debian/wsgi.load etc/apache2/mods-available
-debian/wsgi.conf etc/apache2/mods-available
Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.postinst
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.postinst 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.postinst 2013-05-19 11:22:41 UTC (rev 24436)
@@ -2,16 +2,6 @@
set -e
-apache_force_reload() {
- if apache2ctl configtest 2>/dev/null; then
- #invoke-rc.d apache2 force-reload || true
- # use "restart" as a workaround for bug #558608
- invoke-rc.d apache2 restart || true
- else
- echo "Your apache2 configuration is broken, please fix it and restart apache2 manually."
- fi
-}
-
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,'`
@@ -20,19 +10,7 @@
fi
}
-if [ -z "$2" ]; then
- update_symlink
- if [ -e /etc/apache2/apache2.conf ]; then
- a2enmod wsgi >/dev/null || true
- apache_force_reload
- fi
-else
- #we're upgrading
- update_symlink
- if [ -e /etc/apache2/mods-enabled/wsgi.load ]; then
- apache_force_reload
- fi
-fi
+update_symlink
#DEBHELPER#
Deleted: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.prerm
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.prerm 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.prerm 2013-05-19 11:22:41 UTC (rev 24436)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
- a2dismod wsgi || true
-fi
-
-#DEBHELPER#
-
-exit 0
Added: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.apache2
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.apache2 (rev 0)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.apache2 2013-05-19 11:22:41 UTC (rev 24436)
@@ -0,0 +1,2 @@
+mod debian/wsgi.load
+mod debian/wsgi.conf
Deleted: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install 2013-05-19 11:22:41 UTC (rev 24436)
@@ -1,2 +0,0 @@
-debian/wsgi.load etc/apache2/mods-available
-debian/wsgi.conf etc/apache2/mods-available
Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst 2013-05-19 11:22:41 UTC (rev 24436)
@@ -2,16 +2,6 @@
set -e
-apache_force_reload() {
- if apache2ctl configtest 2>/dev/null; then
- #invoke-rc.d apache2 force-reload || true
- # use "restart" as a workaround for bug #558608
- invoke-rc.d apache2 restart || true
- else
- echo "Your apache2 configuration is broken, please fix it and restart apache2 manually."
- fi
-}
-
update_symlink() {
wsgi_py=`readlink /usr/lib/apache2/modules/mod_wsgi.so | sed 's,.*-,,'`
py_default=`dpkg -s python | grep '^Version' | sed 's,Version: \([^.]*.[^.]*\).*,\1,'`
@@ -20,19 +10,7 @@
fi
}
-if [ -z "$2" ]; then
- update_symlink
- if [ -e /etc/apache2/apache2.conf ]; then
- a2enmod wsgi >/dev/null || true
- apache_force_reload
- fi
-else
- #we're upgrading
- update_symlink
- if [ -e /etc/apache2/mods-enabled/wsgi.load ]; then
- apache_force_reload
- fi
-fi
+update_symlink
#DEBHELPER#
Deleted: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm 2013-05-19 11:22:41 UTC (rev 24436)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
- a2dismod wsgi || true
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: packages/mod-wsgi/trunk/debian/rules
===================================================================
--- packages/mod-wsgi/trunk/debian/rules 2013-05-19 10:45:09 UTC (rev 24435)
+++ packages/mod-wsgi/trunk/debian/rules 2013-05-19 11:22:41 UTC (rev 24436)
@@ -67,6 +67,7 @@
dh_installchangelogs
dh_installdocs
dh_install
+ dh_apache2
install -d -m 755 debian/$(PACKAGE)/usr/share/python/runtime.d
install -d -m 755 debian/$(PACKAGE)-py3/usr/share/python3/runtime.d
install -m 755 debian/$(PACKAGE).rtupdate debian/$(PACKAGE)/usr/share/python/runtime.d/
More information about the Python-modules-commits
mailing list