[Python-modules-commits] r1225 -
/packages/libapache2-mod-python/trunk/debian/
toadstool-guest at users.alioth.debian.org
toadstool-guest at users.alioth.debian.org
Mon Jul 31 20:16:11 UTC 2006
Author: toadstool-guest
Date: Mon Jul 31 20:16:09 2006
New Revision: 1225
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1225
Log:
New python policy transition.
Added:
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.config
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postinst
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postrm
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.templates
packages/libapache2-mod-python/trunk/debian/pycompat
Removed:
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.config
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.dirs
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.docs
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postinst
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postrm
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.templates
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.config
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.dirs
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.docs
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postinst
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postrm
packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.templates
Modified:
packages/libapache2-mod-python/trunk/debian/changelog
packages/libapache2-mod-python/trunk/debian/control
packages/libapache2-mod-python/trunk/debian/rules
Modified: packages/libapache2-mod-python/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/changelog?rev=1225&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog (original)
+++ packages/libapache2-mod-python/trunk/debian/changelog Mon Jul 31 20:16:09 2006
@@ -1,3 +1,9 @@
+libapache2-mod-python (3.2.8-3) unstable; urgency=low
+
+ * New python policy transition (closes: #373561).
+
+ -- Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr> Mon, 31 Jul 2006 20:07:54 +0200
+
libapache2-mod-python (3.2.8-2) unstable; urgency=medium
[ Norbert Tretkowski ]
Modified: packages/libapache2-mod-python/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/control?rev=1225&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/control (original)
+++ packages/libapache2-mod-python/trunk/debian/control Mon Jul 31 20:16:09 2006
@@ -3,19 +3,24 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Robert S. Edmonds <edmonds at debian.org>, Norbert Tretkowski <nobse at debian.org>
-Build-Depends: debhelper (>= 5.0.17), debconf, autoconf, python, python2.3-dev, python2.4-dev, apache2-threaded-dev (>= 2.0.50-10), dpatch
+Build-Depends: debhelper (>= 5.0.37.2), debconf, autoconf, python-all-dev (>= 2.3.5-11), apache2-threaded-dev (>= 2.0.50-10), dpatch, python-central (>= 0.4.17)
+XS-Python-Version: current
Standards-Version: 3.7.2.0
Package: libapache2-mod-python
-Architecture: all
-Depends: libapache2-mod-python2.3 (>= ${Source-Version}), python (>= 2.3), python (<< 2.4)
+Architecture: any
+Depends: ${python:Depends}, debconf | debconf-2.0, ${shlibs:Depends}, apache2-common, apache2
+Suggests: libapache2-mod-python-doc
+Provides: ${python:Provides}
+Replaces: libapache2-mod-python2.4, libapache2-mod-python2.3
+Conflicts: libapache2-mod-python2.4, libapache2-mod-python2.3, libapache2-mod-python2.2, libapache-mod-python, libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.3
+XB-Python-Version: ${python:Versions}
Description: Apache 2 module that embeds Python within the server
mod_python allows you to write web-based applications in Python.
Because the parser is embedded in the server as an Apache module, it
will run many times faster than traditional CGI.
.
- This is a dummy package which depends on the package corresponding to the
- default python version.
+ This package is built for the current Python version.
Package: libapache2-mod-python-doc
Architecture: all
@@ -26,27 +31,3 @@
will run many times faster than traditional CGI scripts.
.
This package contains the module documentation in HTML format.
-
-Package: libapache2-mod-python2.3
-Architecture: any
-Depends: debconf | debconf-2.0, ${shlibs:Depends}, apache2-common, apache2
-Suggests: libapache2-mod-python-doc
-Conflicts: libapache2-mod-python2.2, libapache-mod-python, libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.3
-Description: Apache 2 module that embeds Python 2.3 within the server
- mod_python allows you to write web-based applications in Python.
- Because the parser is embedded in the server as an Apache module, it
- will run many times faster than traditional CGI scripts.
- .
- This version of the package is built for Python 2.3.
-
-Package: libapache2-mod-python2.4
-Architecture: any
-Depends: debconf | debconf-2.0, ${shlibs:Depends}, apache2-common, apache2
-Suggests: libapache2-mod-python-doc
-Conflicts: libapache2-mod-python2.3, libapache2-mod-python2.2, libapache-mod-python, libapache-mod-python2.1, libapache-mod-python2.2, libapache-mod-python2.3
-Description: Apache 2 module that embeds Python 2.4 within the server
- mod_python allows you to write web-based applications in Python.
- Because the parser is embedded in the server as an Apache module, it
- will run many times faster than traditional CGI scripts.
- .
- This version of the package is built for Python 2.4.
Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.config
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.config?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.config (added)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.config Mon Jul 31 20:16:09 2006
@@ -1,0 +1,19 @@
+#!/bin/sh -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ -e /etc/apache2/mods-enabled/mod_python.load ]; then
+ db_set libapache2-mod-python/enable_module true
+else
+ # We want to enable the module by default during initial configuration
+ if [ "$1" = "configure" ] ; then
+ db_set libapache2-mod-python/enable_module true
+ else
+ db_set libapache2-mod-python/enable_module false
+ fi
+fi
+
+# Enable the Apache 2 module?
+db_input medium libapache2-mod-python/enable_module || true
+db_go
Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs (added)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs Mon Jul 31 20:16:09 2006
@@ -1,0 +1,2 @@
+/usr/lib/apache2/modules
+/etc/apache2/mods-available
Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postinst?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postinst (added)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postinst Mon Jul 31 20:16:09 2006
@@ -1,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+MOD_PYTHON_LOAD=/etc/apache2/mods-enabled/mod_python.load
+
+if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
+ db_get libapache2-mod-python/enable_module
+ if [ "$RET" = "true" ]; then
+ test ! -e $MOD_PYTHON_LOAD -o -L $MOD_PYTHON_LOAD && ln -sf ../mods-available/mod_python.load $MOD_PYTHON_LOAD
+ else
+ test -L $MOD_PYTHON_LOAD && rm -f $MOD_PYTHON_LOAD
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postrm
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postrm?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postrm (added)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.postrm Mon Jul 31 20:16:09 2006
@@ -1,0 +1,18 @@
+#! /bin/sh
+
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
+ if [ -L /etc/apache2/mods-enabled/mod_python.load ]; then
+ rm -f /etc/apache2/mods-enabled/mod_python.load
+ fi
+fi
+
+if [ "$1" = "purge" ]; then
+ # Source debconf library
+ . /usr/share/debconf/confmodule
+ # Remove debconf database entries
+ db_purge
+fi
+
+#DEBHELPER#
+
+exit 0
Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.templates
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.templates?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.templates (added)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.templates Mon Jul 31 20:16:09 2006
@@ -1,0 +1,10 @@
+Template: libapache2-mod-python/enable_module
+Type: boolean
+_Description: Enable the Apache 2 mod_python module?
+ You need to enable the module to use websites written for mod_python.
+ .
+ Choosing to enable the module creates a symbolic link for mod_python
+ in /etc/apache2/mods_enabled/, chosing to not enable the module removes
+ that link.
+ .
+ NB. You will need to restart Apache 2 manually after changing this option.
Added: packages/libapache2-mod-python/trunk/debian/pycompat
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/pycompat?rev=1225&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/pycompat (added)
+++ packages/libapache2-mod-python/trunk/debian/pycompat Mon Jul 31 20:16:09 2006
@@ -1,0 +1,1 @@
+2
Modified: packages/libapache2-mod-python/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/rules?rev=1225&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/rules (original)
+++ packages/libapache2-mod-python/trunk/debian/rules Mon Jul 31 20:16:09 2006
@@ -10,6 +10,8 @@
# This is the debhelper compatability version to use.
export DH_COMPAT=5
+
+PYVER=$(shell pyversions -rv)
configure: configure-stamp
configure-stamp:
@@ -55,34 +57,21 @@
autoconf
- # python 2.3
rm -f config.cache config.status
- export PYTHON_BIN=/usr/bin/python2.3
- -env PYTHON_BIN=/usr/bin/python2.3 \
+ export PYTHON_BIN=/usr/bin/python
+ -env PYTHON_BIN=/usr/bin/python \
./configure --with-apxs=/usr/bin/apxs2 --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-python-version=2.3
+ --with-python-version=$(PYVER)
$(MAKE) clean && DEB_DEFINES="-DLONG_LONG=PY_LONG_LONG" $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python2.3
- cp debian/mod_python.load debian/libapache2-mod-python2.3/etc/apache2/mods-available/
-
- # python 2.4
- rm -f config.cache config.status
- export PYTHON_BIN=/usr/bin/python2.4
- -env PYTHON_BIN=/usr/bin/python2.4 \
- ./configure --with-apxs=/usr/bin/apxs2 --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-python-version=2.4
- $(MAKE) clean && DEB_DEFINES="-DLONG_LONG=PY_LONG_LONG" $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python2.4
- cp debian/mod_python.load debian/libapache2-mod-python2.4/etc/apache2/mods-available/
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python
+ cp debian/mod_python.load debian/libapache2-mod-python/etc/apache2/mods-available/
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
dh_testroot -i
- dh_python -i
dh_installdebconf -i
dh_installdocs -i
dh_installexamples -i
@@ -107,8 +96,8 @@
binary-arch: build install
dh_testdir -a
dh_testroot -a
- dh_python -plibapache2-mod-python2.3 /usr/lib/python2.3/site-packages
- dh_python -plibapache2-mod-python2.4 /usr/lib/python2.4/site-packages
+ dh_pycentral -plibapache2-mod-python
+ dh_python -plibapache2-mod-python
dh_installdebconf -a
dh_installdocs -a
dh_installexamples -a
More information about the Python-modules-commits
mailing list