[Python-modules-commits] r2060 - in
/packages/libapache-mod-python/trunk/debian: ./ patches/
toadstool-guest at users.alioth.debian.org
toadstool-guest at users.alioth.debian.org
Thu Apr 12 18:32:47 UTC 2007
Author: toadstool-guest
Date: Thu Apr 12 18:32:47 2007
New Revision: 2060
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2060
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
packages/libapache-mod-python/trunk/debian/ (with props)
packages/libapache-mod-python/trunk/debian/600mod_python.info
packages/libapache-mod-python/trunk/debian/README.Debian
packages/libapache-mod-python/trunk/debian/changelog
packages/libapache-mod-python/trunk/debian/compat
packages/libapache-mod-python/trunk/debian/control
packages/libapache-mod-python/trunk/debian/copyright
packages/libapache-mod-python/trunk/debian/libapache-mod-python-doc.docs
packages/libapache-mod-python/trunk/debian/libapache-mod-python.dirs
packages/libapache-mod-python/trunk/debian/libapache-mod-python.docs
packages/libapache-mod-python/trunk/debian/libapache-mod-python.postinst
packages/libapache-mod-python/trunk/debian/libapache-mod-python.prerm
packages/libapache-mod-python/trunk/debian/patches/
packages/libapache-mod-python/trunk/debian/patches/00list
packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch (with props)
packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch (with props)
packages/libapache-mod-python/trunk/debian/pycompat
packages/libapache-mod-python/trunk/debian/rules (with props)
Propchange: packages/libapache-mod-python/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/libapache-mod-python/trunk/debian/600mod_python.info
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/600mod_python.info?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/600mod_python.info (added)
+++ packages/libapache-mod-python/trunk/debian/600mod_python.info Thu Apr 12 18:32:47 2007
@@ -1,0 +1,26 @@
+LoadModule: python_module /usr/lib/apache/1.3/mod_python.so
+Directives:
+ PythonHandler
+ PythonPostReadRequestHandler
+ PythonTransHandler
+ PythonHeaderParserHandler
+ PythonAccessHandler
+ PythonAuthenHandler
+ PythonTypeHandler
+ PythonFixupHandler
+ PythonHandler
+ PythonInitHandler
+ PythonLogHandler
+ PythonCleanupHandler
+ PythonEnablePdb
+ PythonDebug
+ PythonImport
+ PythonInterpPerDirectory
+ PythonInterpPerDirective
+ PythonHandlerModule
+ PythonNoReload
+ PythonOption
+ PythonPath
+Handles:
+ python-program
+Description: Embedded support for Python scripts
Added: packages/libapache-mod-python/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/README.Debian?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/README.Debian (added)
+++ packages/libapache-mod-python/trunk/debian/README.Debian Thu Apr 12 18:32:47 2007
@@ -1,0 +1,27 @@
+libapache-mod-python for Debian
+-------------------------------
+
+This package has been split into several components:
+libapache-mod-python - module for the current python version
+libapache-mod-python-doc - documentation for this package
+
+The HTML documentation can now be found at:
+/usr/share/doc/libapache-mod-python-doc/doc-html/
+
+If you are having problems with Apache reporting a mime type such as
+text/x-python instead of the mime type produced by your scripts, you
+may need to remove the following line from /etc/apache/mime.types:
+text/x-python py
+
+
+ -- Peter Hawkins <peterh at debian.org>
+
+
+Old README follows:
+WARNING: CONTENTS CHANGE!
+
+As of 1:2.7.1-1 this package contains 'mod_python' <http://www.modpython.org>.
+It use to contain PyApache, but I feel that mod_python provides a much more
+feature rich API.
+
+ -- Kevin Lindsay <klindsay at debian.org>, Fri, 19 Jan 2001 15:16:10 -0800
Added: packages/libapache-mod-python/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/changelog?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/changelog (added)
+++ packages/libapache-mod-python/trunk/debian/changelog Thu Apr 12 18:32:47 2007
@@ -1,0 +1,253 @@
+libapache-mod-python (2:2.7.11-2) unstable; urgency=low
+
+ * Re-enable -DEAPI option in src/Makefile.in, see
+ debian/patches/01_makefiles-configure.dpatch (closes: #387647).
+
+ -- Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr> Fri, 15 Sep 2006 21:06:08 +0200
+
+libapache-mod-python (2:2.7.11-1) unstable; urgency=medium
+
+ * New maintainer (closes: #379680).
+ * New upstream release.
+ * Acknowledge non-maintainer upload 2:2.7.10-4.1 (closes: #362473).
+ * New python policy transition (closes: #373562).
+ * Remove README (useless compilation instructions) from binary packages
+ (closes: #298101).
+ * Bump compatibility level to 5.
+ * Bump Standards version to 3.7.2.1 (no changes).
+
+ -- Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr> Fri, 25 Aug 2006 16:48:15 +0200
+
+libapache-mod-python (2:2.7.10-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop support for python2.1 and python2.2, add
+ libapache-mod-python2.4. Thanks to Stefan Huehner.
+ Closes: #362473.
+ * Remove useless python depends from libapache-mod-python.
+ * Update the debhelper compatibility version in debian/rules.
+ * Replace dh_installmanpages by dh_installman into debian/rules.
+
+ -- Arnaud Fontaine <arnaud at andesi.org> Thu, 20 Apr 2006 00:54:21 +0200
+
+libapache-mod-python (2:2.7.10-4) unstable; urgency=high
+
+ * Security bug fix for information leak vulnerability CVE CAN-2005-0088
+
+ -- Peter Hawkins <peterh at debian.org> Fri, 11 Feb 2005 22:35:59 +1100
+
+libapache-mod-python (2:2.7.10-3) unstable; urgency=low
+
+ * debian/control: Added python to the build dependencies. (closes: #259135)
+ * debian/README.Debian: Added note to Debian readme suggesting the
+ removal of the text/x-python mime-type from /etc/apache/mime.types
+ if necessary. (closes: #233124)
+
+ -- Peter Hawkins <peterh at debian.org> Tue, 13 Jul 2004 17:04:47 +1000
+
+libapache-mod-python (2:2.7.10-2) unstable; urgency=low
+
+ * Fix file upload when using python 2.3 (the python __methods__ attribute
+ on an object appears to have been removed, upstream patch from version
+ 3.0 was applied, thanks to Jeff Bailey). (closes: #228198)
+
+ -- Peter Hawkins <peterh at debian.org> Mon, 19 Jan 2004 12:09:01 +1100
+
+libapache-mod-python (2:2.7.10-1) unstable; urgency=low
+
+ * New upstream release fixes segmentation faults on empty query string
+ components. (closes: #222828)
+ * dh_python is now used to compile the python scripts.
+ * modules-config is now used to enable apache modules rather than
+ apacheconfig (closes: #218975)
+ * Remove spaces from around the authentication realm sent by the publisher
+ handler (closes: #220197)
+ * Provide a default lookup for index.py, if available. (closes: #217229)
+
+ -- Peter Hawkins <peterh at debian.org> Tue, 9 Dec 2003 14:06:45 +1100
+
+libapache-mod-python (2:2.7.8-8) unstable; urgency=low
+
+ * Updated standards version to 3.6.1.
+ * Applied a patch from Jeff Bailey which makes the publisher handler default
+ to adding /index to the end of a python file name, instead of the
+ server error which is the current default. This shouldn't break anything
+ and makes the end result a bit more user-friendly. (closes: #216407).
+ * Acknowledge previous NMU (closes: #206660).
+ * Split the building of architecture dependent and independent packages.
+
+ -- Peter Hawkins <peterh at debian.org> Sun, 19 Oct 2003 09:33:17 +1000
+
+libapache-mod-python (2:2.7.8-7.1) unstable; urgency=low
+
+ * NMU
+ * Use python2.3 as the default python version (closes: #206660).
+
+ -- Matthias Klose <doko at debian.org> Tue, 26 Aug 2003 07:42:03 +0200
+
+libapache-mod-python (2:2.7.8-7) unstable; urgency=low
+
+ * debian/*.postrm: Added 'exit 0' to the end of the postinst to fix problems
+ on purge (closes: #193810).
+ * Since this is a new upload, the package will be rebuilt, fixing #194738.
+ It would still be nice to know what went wrong here, but maybe it isn't
+ worth chasing down. (closes: #194738)
+ * Updated Standards Version to 3.5.10.
+ * Removed Build-Depend on libdb2-dev (since apache now uses libdb4.1
+ instead, and the Build-Dep on apache-dev will pull this in).
+ * Fixed postinst scripts so they don't die when apache is not installed.
+
+ -- Peter Hawkins <peterh at debian.org> Tue, 10 Jun 2003 19:20:42 +1000
+
+libapache-mod-python (2:2.7.8-6) unstable; urgency=low
+
+ * debian/control: Made libapache-mod-python's dependency on
+ libapache-mod-python2.2 versioned (closes: #171703)
+ * debian/control: Updated standards version to 3.5.8.
+
+ -- Peter Hawkins <peterh at debian.org> Thu, 5 Dec 2002 18:04:22 +1100
+
+libapache-mod-python (2:2.7.8-5) unstable; urgency=low
+
+ * Linked against new libpython2.?-pic.a libraries to fix build problems
+ on some archictectures. Bumped build dependency versions. This also
+ fixes a broken python2.1-dev package on ia64.
+ (closes: #163478, #164629)
+
+ -- Peter Hawkins <peterh at debian.org> Wed, 16 Oct 2002 10:19:12 +1000
+
+libapache-mod-python (2:2.7.8-4) unstable; urgency=low
+
+ * Statically linked to python library to fix segfaults.
+ There was some fairly deranged wierdness happening due to linking
+ Python as a shared library. No-one really knew what was going on
+ upstream, so I have made the linking static until such time as
+ this bug can be properly fixed. (closes: #135346, #152750)
+ * Updated Standards version to 3.5.7
+
+ -- Peter Hawkins <peterh at debian.org> Sun, 6 Oct 2002 09:32:31 +1000
+
+libapache-mod-python (2:2.7.8-3) unstable; urgency=low
+
+ * Changed default python version to 2.2.
+ * Added python 2.3 version.
+ * Added extra Conflicts: lines to make dpkg really happy.
+
+ -- Peter Hawkins <peterh at debian.org> Sat, 14 Sep 2002 10:30:02 +1000
+
+libapache-mod-python (2:2.7.8-2) unstable; urgency=low
+
+ * New maintainer (peterh at debian.org) with Kevin's permission.
+ * Recompiled with new libc6 (closes: #156619)
+ * The new upstream version in the NMU has fixed some bugs (at least, I
+ assume so, because I can't reproduce them). (closes: #135346)
+ * Provided multiple versions of package for different python versions
+ (closes: #136081)
+
+ -- Peter Hawkins <peterh at debian.org> Sat, 17 Aug 2002 12:29:53 +1000
+
+libapache-mod-python (2:2.7.8-0.1) unstable; urgency=high
+
+ * NMU, with security fix
+ * New upstream release
+ - Fixes "indirect import" security hole (closes: #143949)
+ * Fixed dist-clean target in Makefile.in to delete src/Makefile
+ and Doc/Makefile so the source cleans properly
+
+ -- Adam Conrad <adconrad at 0c3.net> Sat, 27 Apr 2002 10:12:55 -0600
+
+libapache-mod-python (2:2.7.6-1) unstable; urgency=low
+
+ * Made it compile with shared lib.
+ Closes: #127213
+ * Recompiled with latest python2.1 which has a patch which fixed problems with mod-python.
+ Closes: #126164
+ * Also fixed the versioning a bit. Not sure why I used 2.7.6.1 and not 2.7.6-1.
+ Its all in the fruit loops.
+
+ -- Kevin Lindsay <klindsay at debian.org> Wed, 16 Jan 2002 06:55:38 +0000
+
+libapache-mod-python (1:2.7.6.1) unstable; urgency=low
+
+ * New minor version.
+ * Updated package to work with new python 2.1 base packages.
+ * Fixed scripts.
+ Closes: #118269, #107274, #112643, #115803
+
+ -- Kevin Lindsay <klindsay at debian.org> Sat, 10 Nov 2001 09:08:08 +0000
+
+libapache-mod-python (1:2.7.5-1) unstable; urgency=low
+
+ * Bug Fix Release.
+ * Fixed maintainer scripts.
+ Closes: #98543
+ * Can't duplicate bug #99736 but I have a good suspicion that the above
+ fix will fix it. If not please reopen.
+ Closes: #99736
+
+ -- Kevin Lindsay <klindsay at debian.org> Wed, 4 Jul 2001 17:46:37 -0700
+
+libapache-mod-python (1:2.7.3-1) unstable; urgency=low
+
+ * Bug Fix Release.
+
+ -- Kevin Lindsay <klindsay at debian.org> Mon, 21 May 2001 15:25:26 -0700
+
+libapache-mod-python (1:2.7.2-4) unstable; urgency=low
+
+ * Added libdb2-dev to build depends
+ * Adding commas to by closes list.
+ Closes: #86543, #58582, #48804, #66707
+
+ -- Kevin Lindsay <klindsay at debian.org> Mon, 19 Feb 2001 01:25:59 -0800
+
+libapache-mod-python (1:2.7.2-3) unstable; urgency=low
+
+ * Now byte compiles module with /usr/bin/python2 instead of /usr/bin/python.
+ Closes: #85849
+ * Closing bug from last change (1:2.7.2-2) Closes: #85790
+ * Closing bugs because of module content change. This is no longer
+ pyapache as of 1:2.7.1-1.
+ Closes: #62413 #58582 #48804 #66707
+
+ -- Kevin Lindsay <klindsay at debian.org> Thu, 15 Feb 2001 23:32:17 -0800
+
+libapache-mod-python (1:2.7.2-2) unstable; urgency=low
+
+ * Made configure check for /usr/bin/python2 instead of /usr/bin/python
+ since it requires python2 not python 1.5.
+
+ -- Kevin Lindsay <klindsay at debian.org> Wed, 14 Feb 2001 23:59:33 -0800
+
+libapache-mod-python (1:2.7.2-1) unstable; urgency=low
+
+ * New Version.
+
+ -- Kevin Lindsay <klindsay at debian.org> Mon, 12 Feb 2001 01:15:59 -0800
+
+libapache-mod-python (1:2.7.1-3) unstable; urgency=low
+
+ * Fixed a build-depends. changes python2-base to python2-dev
+
+ -- Kevin Lindsay <klindsay at debian.org> Mon, 12 Feb 2001 01:15:41 -0800
+
+libapache-mod-python (1:2.7.1-2) unstable; urgency=low
+
+ * Fixed some lintian warnings and errors. It still reports and error
+ regarding the mod_python.so not being compiled with pic code. Each
+ object file is compiled with -fPIC so it should be fine. If someone
+ finds the reason, please let me know.
+
+ -- Kevin Lindsay <klindsay at debian.org> Tue, 30 Jan 2001 00:56:06 -0800
+
+libapache-mod-python (1:2.7.1-1) unstable; urgency=low
+
+ * Adopted from <flight at debian.org>.
+ * Contents of package changed from PyApache to mod_python.
+ * Closes: #83417
+
+ -- Kevin Lindsay <klindsay at debian.org> Fri, 19 Jan 2001 15:47:33 -0800
+
+Local variables:
+mode: debian-changelog
+End:
Added: packages/libapache-mod-python/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/compat?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/compat (added)
+++ packages/libapache-mod-python/trunk/debian/compat Thu Apr 12 18:32:47 2007
@@ -1,0 +1,1 @@
+5
Added: packages/libapache-mod-python/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/control?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/control (added)
+++ packages/libapache-mod-python/trunk/debian/control Thu Apr 12 18:32:47 2007
@@ -1,0 +1,34 @@
+Source: libapache-mod-python
+Section: python
+Priority: optional
+Maintainer: Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr>
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, autoconf, python-dev (>= 2.4.3-11), python-central (>= 0.5), apache-dev (>= 1.3.22)
+XS-Python-Version: current
+Standards-Version: 3.7.2.1
+
+Package: libapache-mod-python
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, apache-common (>= 1.3.29-1)
+Provides: ${python:Provides}, libapache-mod-python2.3, libapache-mod-python2.4
+Conflicts: libapache-mod-python2.3 (<< 2:2.7.11-1), libapache-mod-python2.4 (<< 2:2.7.11-1)
+Replaces: libapache-mod-python2.3 (<< 2:2.7.11-1), libapache-mod-python2.4 (<< 2:2.7.11-1)
+Suggests: libapache-mod-python-doc
+XB-Python-Version: ${python:Versions}
+Description: An Apache module that embeds Python within the server
+ Warning: This package used to contain PyApache. It now
+ contains ModPython. This apache module allows you to
+ write web-based applications in Python that will run
+ many times faster than traditional CGI.
+ .
+ This package is built for the current Python version.
+
+Package: libapache-mod-python-doc
+Section: doc
+Architecture: all
+Suggests: www-browser
+Description: An Apache module that embeds Python within the server
+ mod_python is an apache module that allows you to
+ write web-based applications in Python that will run
+ many times faster than traditional CGI.
+ .
+ This package contains the module documentation in HTML format.
Added: packages/libapache-mod-python/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/copyright?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/copyright (added)
+++ packages/libapache-mod-python/trunk/debian/copyright Thu Apr 12 18:32:47 2007
@@ -1,0 +1,70 @@
+This package was debianized by Kevin Lindsay <klindsay at debian.org> on
+Fri, 19 Jan 2001 15:16:10 -0800.
+
+It was downloaded from www.modpython.org
+
+Upstream Author: Gregory Trubetskoy <grisha at modpython.org>
+
+Copyright:
+
+/* ====================================================================
+ * Copyright (c) 2000 Gregory Trubetskoy. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowledgment: "This product
+ * includes software developed by Gregory Trubetskoy."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "mod_python", "modpython" or "Gregory Trubetskoy" must not
+ * be used to endorse or promote products derived from this software
+ * without prior written permission. For written permission, please
+ * contact grisha at modpython.org.
+ *
+ * 5. Products derived from this software may not be called "mod_python"
+ * or "modpython", nor may "mod_python" or "modpython" appear in their
+ * names without prior written permission of Gregory Trubetskoy.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GREGORY TRUBETSKOY ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GREGORY TRUBETSKOY OR
+ * HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software is based on the original concept
+ * as published in the book "Internet Programming with Python"
+ * by Aaron Watters, Guido van Rossum and James C. Ahlstrom,
+ * 1996 M&T Books, ISBN: 1-55851-484-8. The book and original
+ * software is Copyright 1996 by M&T Books.
+ *
+ * This software consists of an extension to the Apache http server.
+ * More information about Apache may be found at
+ *
+ * http://www.apache.org/
+ *
+ * More information on Python language can be found at
+ *
+ * http://www.python.org/
+ *
+ */
+
Added: packages/libapache-mod-python/trunk/debian/libapache-mod-python-doc.docs
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/libapache-mod-python-doc.docs?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/libapache-mod-python-doc.docs (added)
+++ packages/libapache-mod-python/trunk/debian/libapache-mod-python-doc.docs Thu Apr 12 18:32:47 2007
@@ -1,0 +1,3 @@
+doc-html/
+debian/README.Debian
+NEWS
Added: packages/libapache-mod-python/trunk/debian/libapache-mod-python.dirs
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/libapache-mod-python.dirs?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/libapache-mod-python.dirs (added)
+++ packages/libapache-mod-python/trunk/debian/libapache-mod-python.dirs Thu Apr 12 18:32:47 2007
@@ -1,0 +1,1 @@
+usr/lib/apache/1.3
Added: packages/libapache-mod-python/trunk/debian/libapache-mod-python.docs
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/libapache-mod-python.docs?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/libapache-mod-python.docs (added)
+++ packages/libapache-mod-python/trunk/debian/libapache-mod-python.docs Thu Apr 12 18:32:47 2007
@@ -1,0 +1,2 @@
+debian/README.Debian
+NEWS
Added: packages/libapache-mod-python/trunk/debian/libapache-mod-python.postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/libapache-mod-python.postinst?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/libapache-mod-python.postinst (added)
+++ packages/libapache-mod-python/trunk/debian/libapache-mod-python.postinst Thu Apr 12 18:32:47 2007
@@ -1,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" -o "$1" = "reconfigure" ]; then
+ for i in apache apache-perl apache-ssl; do
+ if [ -e /etc/$i/httpd.conf ]; then
+ modules-config $i enable mod_python
+ fi
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
Added: packages/libapache-mod-python/trunk/debian/libapache-mod-python.prerm
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/libapache-mod-python.prerm?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/libapache-mod-python.prerm (added)
+++ packages/libapache-mod-python/trunk/debian/libapache-mod-python.prerm Thu Apr 12 18:32:47 2007
@@ -1,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
+ for i in apache apache-perl apache-ssl; do
+ if [ -e /etc/$i/httpd.conf ]; then
+ modules-config $i disable mod_python quiet
+ fi
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
Added: packages/libapache-mod-python/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/patches/00list?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/patches/00list (added)
+++ packages/libapache-mod-python/trunk/debian/patches/00list Thu Apr 12 18:32:47 2007
@@ -1,0 +1,2 @@
+01_makefiles-configure.dpatch
+02_publisher.py.dpatch
Added: packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch (added)
+++ packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch Thu Apr 12 18:32:47 2007
@@ -1,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_link-with-libpython-pic.dpatch by <jeremie.corbier at resel.enst-bretagne.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix install path and make mod_python link against pythonX.X-pic.a.
+
+ at DPATCH@
+diff -urNad libapache-mod-python~/Makefile.in libapache-mod-python/Makefile.in
+--- libapache-mod-python~/Makefile.in 2006-08-01 10:20:11.000000000 +0200
++++ libapache-mod-python/Makefile.in 2006-08-01 14:05:34.000000000 +0200
+@@ -82,7 +82,8 @@
+ @echo
+ @echo "Performing DSO installation."
+ @echo
+- $(INSTALL) src/mod_python.so $(LIBEXECDIR)
++ $(INSTALL) -m 644 src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
++ $(INSTALL) -m 644 debian/600mod_python.info $(DESTDIR)$(LIBEXECDIR)
+ @$(MAKE) install_py_lib
+ @echo
+ @echo "Now don't forget to edit your main config and add"
+@@ -114,17 +115,17 @@
+ @echo
+
+ install_py_lib:
+- $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
++ $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
+ @for f in `ls lib/python/mod_python/*.py`; \
+ do \
+- $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
++ $(INSTALL) -m 644 $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
+ done
+- python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
++ #python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+
+ clean:
+ cd src && $(MAKE) clean
+ rm -f core
+
+ distclean: clean
+- rm -rf Makefile config.h config.status config.cache config.log
++ rm -rf Makefile src/Makefile Doc/Makefile config.h config.status config.cache config.log
+
+diff -urNad libapache-mod-python~/configure.in libapache-mod-python/configure.in
+--- libapache-mod-python~/configure.in 2006-08-01 10:20:11.000000000 +0200
++++ libapache-mod-python/configure.in 2006-08-01 14:04:50.000000000 +0200
+@@ -242,12 +242,12 @@
+ if test -z "$PYTHON_SRC"; then
+ PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION}
+ PyLIBPL=${PyLIBP}/config
+- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
++ PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}-pic.a
+ PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+ PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+ PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}"
+ else
+- PyPYTHONLIBS=${PYTHON_SRC}/libpython${PyVERSION}.a
++ PyPYTHONLIBS=${PYTHON_SRC}/libpython${PyVERSION}-pic.a
+ if test ${PyVERSION} = "2.1"; then
+ PyLIBS=`grep "^LIB[[SMC]]=" ${PYTHON_SRC}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+ PyMODLIBS=`grep "^LOCALMODLIBS=" ${PYTHON_SRC}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+diff -urNad libapache-mod-python~/src/Makefile.in libapache-mod-python/src/Makefile.in
+--- libapache-mod-python~/src/Makefile.in 2006-08-01 10:20:11.000000000 +0200
++++ libapache-mod-python/src/Makefile.in 2006-08-01 14:04:50.000000000 +0200
+@@ -52,7 +52,7 @@
+ INCLUDES=@INCLUDES@
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+-OPT=
++OPT= -fPIC -DEAPI
+ CFLAGS=$(OPT) $(INCLUDES)
+ srcdir=.
+
+@@ -119,4 +119,4 @@
+ serverobject.o: serverobject.c
+ connobject.o: connobject.c
+
+-# DO NOT DELETE THIS LINE
+\ No newline at end of file
++# DO NOT DELETE THIS LINE
Propchange: packages/libapache-mod-python/trunk/debian/patches/01_makefiles-configure.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch (added)
+++ packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch Thu Apr 12 18:32:47 2007
@@ -1,0 +1,87 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_publisher.py.dpatch by <jeremie.corbier at resel.enst-bretagne.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adapted from a patch by Jeff Bailey which makes the publisher handler
+## DP: default to adding /index to the end of a python file name, instead of
+## DP: the server error which is the current default.
+
+ at DPATCH@
+diff -urNad libapache-mod-python~/lib/python/mod_python/publisher.py libapache-mod-python/lib/python/mod_python/publisher.py
+--- libapache-mod-python~/lib/python/mod_python/publisher.py 2006-08-01 10:20:11.000000000 +0200
++++ libapache-mod-python/lib/python/mod_python/publisher.py 2006-08-01 14:39:24.000000000 +0200
+@@ -64,6 +64,7 @@
+ import base64
+
+ import new
++from types import *
+
+ from types import *
+
+@@ -81,14 +82,16 @@
+
+ args = {}
+
+- # get the path PATH_INFO (everthing after script)
+- if not _req.subprocess_env.has_key("PATH_INFO"):
+- raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
+-
+- func_path = _req.subprocess_env["PATH_INFO"][1:] # skip fist /
+- func_path = string.replace(func_path, "/", ".")
+- if func_path[-1] == ".":
+- func_path = func_path[:-1]
++ func_path = ""
++ if req.path_info:
++ func_path = req.path_info[1:] # skip first /
++ func_path = func_path.replace("/", ".")
++ if func_path[-1:] == ".":
++ func_path = func_path[:-1]
++
++ # default to 'index' if no path_info was given
++ if not func_path:
++ func_path = "index"
+
+ # if any part of the path begins with "_", abort
+ if func_path[0] == '_' or string.count(func_path, "._"):
+@@ -122,6 +125,8 @@
+
+ # import the script
+ path, module_name = os.path.split(_req.filename)
++ if not module_name:
++ module_name = "index"
+
+ # get rid of the suffix
+ module_name = suff_matcher.sub("", module_name)
+@@ -249,7 +254,7 @@
+ if found_auth:
+
+ if not user:
+- s = 'Basic realm = "%s"' % realm
++ s = 'Basic realm="%s"' % realm
+ req.err_headers_out["WWW-Authenticate"] = s
+ raise apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED
+
+@@ -262,7 +267,7 @@
+ rc = __auth__
+
+ if not rc:
+- s = 'Basic realm = "%s"' % realm
++ s = 'Basic realm="%s"' % realm
+ req.err_headers_out["WWW-Authenticate"] = s
+ raise apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED
+
+@@ -319,9 +324,13 @@
+ def __init__(self, field):
+
+ # steal all the file-like methods
+- for m in field.file.__methods__:
++ for m in self.sim_methods(field.file):
+ self.__dict__[m] = getattr(field.file, m)
+
+ self.headers = field.headers
+ self.filename = field.filename
+
++ def sim_methods(self,obj):
++ from types import BuiltinMethodType #parte aggiunta
++ return filter(lambda s, t=obj:
++ type(getattr(t, s)) == BuiltinMethodType, dir(obj))
Propchange: packages/libapache-mod-python/trunk/debian/patches/02_publisher.py.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/libapache-mod-python/trunk/debian/pycompat
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/pycompat?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/pycompat (added)
+++ packages/libapache-mod-python/trunk/debian/pycompat Thu Apr 12 18:32:47 2007
@@ -1,0 +1,1 @@
+2
Added: packages/libapache-mod-python/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache-mod-python/trunk/debian/rules?rev=2060&op=file
==============================================================================
--- packages/libapache-mod-python/trunk/debian/rules (added)
+++ packages/libapache-mod-python/trunk/debian/rules Thu Apr 12 18:32:47 2007
@@ -1,0 +1,89 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Modified for libapache-mod-python by Peter Hawkins, (c) 2003.
+
+include /usr/share/dpatch/dpatch.make
+
+PYVER=$(shell pyversions -rv)
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: patch configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ -$(MAKE) distclean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ autoconf
+
+ rm -f config.cache config.status
+ export PYTHON_BIN=/usr/bin/python
+ -env PYTHON_BIN=/usr/bin/python \
+ ./configure --enable-EAPI --prefix=/usr \
+ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+ --with-python-version=$(PYVER)
+ $(MAKE) clean && $(MAKE)
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installmenu -i
+ dh_installcron -i
+ dh_installman -i
+ dh_installinfo -i
+ dh_installchangelogs -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installman -a
+ dh_installinfo -a
+ dh_installchangelogs -a
+ dh_pycentral -plibapache-mod-python
+ dh_python -plibapache-mod-python
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Propchange: packages/libapache-mod-python/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
More information about the Python-modules-commits
mailing list