--- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python.postinst +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python.postinst @@ -0,0 +1,52 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +OLDENABLED=/etc/apache2/mods-enabled/mod_python.load +OLDAVAILABLE=/etc/apache2/mods-available/mod_python.load + +# Before 3.3.1-3, the module had a different name, so if we are upgrading +# from such an old package, re-enable the module if it was enabled +if dpkg --compare-versions "$2" lt-nl "3.3.1-3"; then + test -L $OLDENABLED && rm -f $OLDENABLED && a2enmod python >/dev/null || true + test -e $OLDAVAILABLE && rm -f $OLDAVAILABLE +fi + + +reload_apache() +{ + if apache2ctl configtest 2>/dev/null; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d apache2 force-reload || exit $? + else + /etc/init.d/apache2 force-reload || exit $? + fi + else + echo "Your apache2 configuration is broken, so we're not restarting it for you." + fi +} + +PYTHON_LOAD=/etc/apache2/mods-enabled/python.load + +# Inspired in libapache2-mod-php5.postinst + +if [ "$1" = "configure" -a -n "$2" ]; then + # Upgrading from a previous version. Only restart apache + # if the python mod is enabled + if [ -e $PYTHON_LOAD ]; then + reload_apache + fi + exit 0 +fi + + +if [ "$1" = "configure" ]; then + # Not upgrading from a previous version, enable the module + if [ -e /etc/apache2/apache2.conf ]; then + a2enmod python >/dev/null || true + reload_apache + fi +fi + +exit 0 --- libapache2-mod-python-3.3.1.orig/debian/python.load +++ libapache2-mod-python-3.3.1/debian/python.load @@ -0,0 +1 @@ +LoadModule python_module /usr/lib/apache2/modules/mod_python.so --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python-doc.docs +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python-doc.docs @@ -0,0 +1,4 @@ +doc-html/ +debian/README.Debian +NEWS +README --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python.prerm +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python.prerm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" = remove ] || [ "$1" = purge ]; then + if [ -e /etc/apache2/apache2.conf ] && [ -x /usr/sbin/a2dismod ]; then + a2dismod python || true + fi +fi + +#DEBHELPER# + +exit 0 --- libapache2-mod-python-3.3.1.orig/debian/control +++ libapache2-mod-python-3.3.1/debian/control @@ -0,0 +1,39 @@ +Source: libapache2-mod-python +Section: httpd +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team +Uploaders: Robert S. Edmonds +Build-Depends: debhelper (>= 5.0.38), autoconf, python-dev (>= 2.6.6-3~), + apache2-threaded-dev (>= 2.2.3-1), dpatch, +Vcs-Svn: svn://svn.debian.org/python-modules/packages/libapache2-mod-python/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/libapache2-mod-python/trunk/ +Homepage: http://www.modpython.org/ +Standards-Version: 3.9.2 + +Package: libapache2-mod-python +Architecture: any +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, apache2.2-common, apache2 +Suggests: libapache2-mod-python-doc +Provides: ${python:Provides}, libapache2-mod-python${python:Versions} +Replaces: libapache2-mod-python2.4 (<< 3.2.8-3), libapache2-mod-python2.3 (<< 3.2.8-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 +Description: Python-embedding module for Apache 2 + The mod_python module supports web applications written in Python. + Because the parser is embedded in the server as an Apache module, it + will run much faster than traditional CGI. + . + This package is built for the current Python version. + +Package: libapache2-mod-python-doc +Architecture: all +Depends: ${misc:Depends} +Suggests: www-browser +Section: doc +Description: Python-embedding module for Apache 2 - documentation + The mod_python module supports web applications written in Python. + Because the parser is embedded in the server as an Apache module, it + will run much faster than traditional CGI. + . + This package contains the module documentation in HTML format. --- libapache2-mod-python-3.3.1.orig/debian/README.source +++ libapache2-mod-python-3.3.1/debian/README.source @@ -0,0 +1,4 @@ +This package uses dpatch to handle patches against upstream source code; you +can find additional information about dpatch at + + /usr/share/doc/dpatch/ --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python.postrm +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python.postrm @@ -0,0 +1,17 @@ +#! /bin/sh + +set -e + +# mod_python.load renamed to python.load in 3.3.1-3 +if dpkg --compare-versions "$2" lt-nl "3.3.1-3"; then + # downgrading to < 3.3.1-3 -- we have to restore pseudo conffile + if [ ! -e /etc/apache2/mods-available/mod_python.load ]; then + echo "LoadModule python_module /usr/lib/apache2/modules/mod_python.so" > /etc/apache2/mods-available/mod_python.load + fi +elif [ -e /etc/apache2/mods-available/mod_python.load ]; then + rm -f /etc/apache2/mods-available/mod_python.load +fi + +#DEBHELPER# + +exit 0 --- libapache2-mod-python-3.3.1.orig/debian/rules +++ libapache2-mod-python-3.3.1/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f +# debian/rules for Apache mod_python 3 +# GNU copyright 1997 to 1999 by Joey Hess. +# Copyright (c) 2003 Peter Hawkins + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +PYVER=$(shell pyversions -d) + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + # Don't configure here (see install) +# -./configure --enable-EAPI --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + touch $@ + +build: configure-stamp build-stamp +build-stamp: patch + dh_testdir + + # Add here commands to compile the package. + # Don't build it here, see install + #$(MAKE) + #/usr/bin/docbook-to-man debian/libapache-mod-python.sgml > libapache-mod-python.1 + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.log configure src/include/mod_python.h + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/libapache-mod-python. + #$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python + + autoconf + + rm -f config.cache config.status + 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=$(PYVER) + $(MAKE) clean && DEB_DEFINES="-DLONG_LONG=PY_LONG_LONG" $(MAKE) + $(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python + cp debian/python.load debian/libapache2-mod-python/etc/apache2/mods-available/ + + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i + dh_installmenu -i + dh_installcron -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 + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_python2 -plibapache2-mod-python --no-guessing-versions + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_installcron -a + dh_installinfo -a + dh_installchangelogs -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + # You may want to make some executables suid here. +# dh_suidregister +# dh_makeshlibs + 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 unpatch --- libapache2-mod-python-3.3.1.orig/debian/changelog +++ libapache2-mod-python-3.3.1/debian/changelog @@ -0,0 +1,456 @@ +libapache2-mod-python (3.3.1-9ubuntu2~precise) precise; urgency=low + + * Rebuild for Precise + + -- Timothy Pearson Wed, 19 Nov 2014 10:55:00 -0600 + +libapache2-mod-python (3.3.1-9ubuntu1) oneiric; urgency=low + + * Switch to dh_python2. (LP: #788514) + + -- Barry Warsaw Tue, 09 Aug 2011 19:04:50 -0400 + +libapache2-mod-python (3.3.1-9build2) natty; urgency=low + + * No change rebuild to eliminate version mismatch warnings. (LP: #766834) + + -- Barry Warsaw Wed, 20 Apr 2011 16:35:57 -0400 + +libapache2-mod-python (3.3.1-9build1) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:05:30 +0000 + +libapache2-mod-python (3.3.1-9) unstable; urgency=low + + [ Sandro Tosi ] + * debian/libapache2-mod-python.{prerm, postrm} + - move a2dismod from postrm (executed too late in the purge process) to + prerm, so purge can disable the module when it's still available; thanks + to Lucas Nussbaum for the report; Closes: #574229 + * debian/control + - bump Standards-Version to 3.8.4 (no changes needed) + - updated Section to 'httpd' to match override file + + -- Debian Python Modules Team Sat, 27 Mar 2010 14:41:02 +0100 + +libapache2-mod-python (3.3.1-8) unstable; urgency=medium + + [ Emilio Pozuelo Monfort ] + * Unconditionally enable the Apache module upon first install, instead + of asking the user through debconf. Closes: #512755. + * Remove debconf templates and build magic because of the above change. + + [ Sandro Tosi ] + * debian/patches/10_bts521965.dpatch + - fix a FTBFS due to new apr (> 1.3.x); thanks to Daniel Schepler for the + report; Closes: #521965 (RC hence urgency=medium) + * debian/control + - bump Standards-Version to 3.8.2 (no changes needed) + * debian/libapache2-mod-python.postinst + - use 'dpkg --compare-versions' + + -- Debian Python Modules Team Wed, 08 Jul 2009 00:16:42 +0200 + +libapache2-mod-python (3.3.1-7) unstable; urgency=low + + [ Sandro Tosi ] + * debian/po/pt_BR.po + - updated Brazilian Portuguese debconf templates translation; thanks to + Eder L. Marques for the report and patch; Closes: #511886 + * debian/po/nl.po + - updated Dutch debconf templates translation; thanks to Thijs Kinkhorst and + Vincent Zweije; for location of translated po file, have a look at + http://lists.debian.org/debian-l10n-dutch/2009/01/msg00031.html + + -- Debian Python Modules Team Fri, 30 Jan 2009 11:26:57 +0100 + +libapache2-mod-python (3.3.1-6) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + - add ${misc:Depends} to bin packages Depends + * debian/po/es.po + - updated Spanish debconf translation; thanks to Francisco Javier Cuadrado; + Closes: #506982 + * debian/libapache2-mod-python.postrm + - added 'set -e' + + -- Debian Python Modules Team Thu, 18 Dec 2008 08:51:47 +0100 + +libapache2-mod-python (3.3.1-5) unstable; urgency=low + + [ Sandro Tosi ] + * debian/po/eu.po + - updated Basque debconf translation; thanks to Xabier Bilbao; + Closes: #492409 + + -- Debian Python Modules Team Mon, 11 Aug 2008 00:00:01 +0200 + +libapache2-mod-python (3.3.1-4) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + - bump Standards-Version to 3.8.0 + + added debian/README.source + * debian/po/tr.po + - added Turkish debconf translation; thanks to Mert Dirik; Closes: #491240 + * debian/po/sv.po + - updated Swedish debconf translation; thanks to Martin Bagge; + Closes: #490788 + * debian/po/sk.po + - updated Slovak debconf translation; thanks to Ivan Masár; + Closes: #483521 + * debian/po/gl.po + - updated Galician debconf translation; thanks to Jacobo Tarrio; + Closes: #480976 + * debian/po/vi.po + - updated Vietnamese debconf translation; thanks to Clytie Siddall; + Closes: #491435 + * debian/libapache2-mod-python-doc.doc-base + - updated Section to Programming/Python + * debian/po/eu.po + - added Basque debconf translation; thanks to Xabier Bilbao; + Closes: #492043 + * debian/patches/{01_configure,02_makefile,03_includes}.dpatch + - renamed from .diff + - added dpatch header and remove the scripting code + + [ Norbert Tretkowski ] + * Remove myself from uploaders. + + [ David Paleino ] + * Removed myself from Uploaders. + + [ Piotr Ożarowski ] + * Remove myself from uploaders. + + -- Debian Python Modules Team Thu, 24 Jul 2008 19:41:46 +0200 + +libapache2-mod-python (3.3.1-3) unstable; urgency=low + + [ Piotr Ożarowski ] + * Rename mod_python.load to python.load (to follow + /etc/apache2/mods-available best practise, closes: 456917) + * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) + * Added initial Slovak debconf translation from Ivan Masár (closes: #438584) + * Updated Vietnamese debconf translation from Clytie Siddall + (closes: #453622) + * Define debhelper's compatibility mode in debian/compat instead of + debian/rules (to make lintian happy) + * Change libapache2-mod-python-doc's section to "doc" + * Bump Standards-Version to 3.7.3 (no changes needed) + + [ David Paleino ] + * debian/po/it.po updated (closes: #451608) + * debian/control: + - added myself to Uploaders + - added Homepage field + - wrapped Uploaders, Build-Depends and Conflicts fields + * debian/rules: + - don't ignore the value of $(MAKE) distclean + - removed useless commented dh_* calls + - some minor changes + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n-english + team as part of the Smith review project. Closes: #450417 + * [Debconf translation updates] + * Japanese. Closes: #450900 + * Portuguese. Closes: #451020 + * Finnish. Closes: #451148 + * Italian. Closes: #451608 + * German. Closes: #451881 + * French. Closes: #452636 + * Russian. Closes: #434229, #452735 + * Polish. Closes: #452960 + * Czech. Closes: #453030 + + -- Piotr Ożarowski Thu, 27 Dec 2007 17:06:19 +0100 + +libapache2-mod-python (3.3.1-2) unstable; urgency=low + + [ Norbert Tretkowski ] + * Added Piotr Ożarowski as uploader. + + [ Robert S. Edmonds ] + * Add updated po-debconf templates. (closes: #421528, #427030) + + -- Robert S. Edmonds Fri, 15 Jun 2007 21:40:28 -0400 + +libapache2-mod-python (3.3.1-1) unstable; urgency=low + + * New upstream release + * Remove configure and mod_python.h files in clean rule to make the diff.gz + file smaller + * Current Python version in libapache2-mod-pythonX.Y package name (Provides: + field) filled in automatically. + * Added XS-Vcs-Browser field + + -- Piotr Ożarowski Thu, 12 Apr 2007 20:52:05 +0200 + +libapache2-mod-python (3.2.10-4) unstable; urgency=low + + * Added XS-Vcs-Svn field + * Removed "db_purge" part from libapache2-mod-python.postrm + (dh_installdebconf is generating a rule that will not fail if debconf is + already removed) + * Added initial Spanish debconf translation from Manuel Porras Peralta. + (closes: #411235) + * Added initial Portuguese debconf translation from Pedro Ribeiro. + (closes: #411742) + * Added initial Galician debconf translation from Jacobo Tarrio. + (closes: #411831) + + -- Piotr Ozarowski Wed, 21 Feb 2007 18:24:29 +0100 + +libapache2-mod-python (3.2.10-3) unstable; urgency=medium + + [ Piotr Ozarowski ] + * Rebuild for Python 2.4.4. (closes: #398680) + * Removed libapache2-mod-python2.3 from Provides. (closes: #393927) + * Added initial German debconf translation from Matthias Julius. + (closes: #394949) + * Removed no longer needed debian/pycompat file. + + -- Norbert Tretkowski Sun, 19 Nov 2006 22:08:41 +0100 + +libapache2-mod-python (3.2.10-2) unstable; urgency=medium + + [ Piotr Ozarowski ] + * Dependencies updated: + + replaced apache2-common with apache2.2-common (closes: #391790) + + bumped apache2-threaded-dev version (see above), + + bumped python-central version (dh_python removed from debian/rules), + + bumped debhelper version (see above), + + added po-debconf to Build-Depends (lintian error). + * Removed deprecated dh_installmanpages from debian/rules + (there are no manpages to install). + * Updated Dutch debconf translation from Vincent Zweije. (closes: #388834) + * Updated Czech debconf translation from Miroslav Kure. (closes: #384752) + * Updated Japanese debconf translation from Hideki Yamane. (closes: #391811) + + -- Norbert Tretkowski Thu, 12 Oct 2006 17:14:47 +0200 + +libapache2-mod-python (3.2.10-1) unstable; urgency=low + + * New upstream release. + * Updated 01_configure.diff patches for new release. + * Updated Standards-Version to 3.7.2.1, no changes required. + + -- Norbert Tretkowski Sat, 19 Aug 2006 10:58:20 +0200 + +libapache2-mod-python (3.2.8-3) unstable; urgency=low + + [ Jeremie Corbier ] + * New python policy transition. (closes: #373561) + * Added initial dutch debconf translation from Vincent Zweije. + (closes: #368649) + * Updated french debconf translation from Jean-Luc Coulon. + (closes: #376547) + * Updated italian debconf translation from Luca Monducci. + (closes: #382088) + + [ Piotr Ozarowski ] + * Added initial polish debconf translation. + + -- Norbert Tretkowski Fri, 18 Aug 2006 12:41:39 +0200 + +libapache2-mod-python (3.2.8-2) unstable; urgency=medium + + [ Norbert Tretkowski ] + * Added initial italian debconf translation from Luca Monducci. + (closes: #368342) + * Acknowledge Non-Maintainer Upload 3.1.3-2.1. (closes: #266188) + + [ Robert S. Edmonds ] + * Patching the generated configure script is wrong and unnecessary. + (closes: #370234, #375582) + + [ Piotr Ozarowski ] + * Added watch file. + + -- Norbert Tretkowski Sun, 30 Jul 2006 11:02:27 +0200 + +libapache2-mod-python (3.2.8-1) unstable; urgency=low + + * New upstream release. (closes: #360654) + + Correctly support the HEAD method. (closes: #297289) + + Correctly recognizes DirectoryIndex instruction. (closes: #358750) + + Fixes segfaults with apache2-mpm-worker. (closes: #365302) + + [ Robert S. Edmonds ] + * Added python2.4 packages. (closes: #347219) + * Backported bash 3.1 configure script fix from upstream. + (closes: #367450) + + [ Norbert Tretkowski ] + * Set Maintainer to Debian Python Modules Team. + * Added Robert and myself to uploaders. + * Removed python2.2 packages. (closes: #353805, #362474) + * Depend on debconf | debconf-2.0. (closes: #331996) + * Updated french debconf translation from Jean-Luc Coulon. + (closes: #287245) + * Added initial vietnamese debconf translation from Clytie Siddall. + (closes: #312233) + * Added initial brazilian portuguese debconf translation from Andre Luis + Lopes. (closes: #262564) + * Added initial czech debconf translation from Miroslav Kure. + (closes: #289510) + * Added initial swedish debconf translation from Daniel Nylander. + (closes: #333404) + * Fixed typo in all debconf translations. (closes: #316296) + * Added doc-base file from Paul Brossier. (closes: #331012) + * Run debconf-updatepo in clean target. + * Adjusted README.Debian to it reflects the new packages. + * Updated standards-version to 3.7.2.0, no changes required. + * Splitted out patches and used dpatch instead. + * Fixed debconf templates to make lintian happy. + + -- Norbert Tretkowski Tue, 16 May 2006 18:45:41 -0500 + +libapache2-mod-python (3.1.3-3) unstable; urgency=high + + * Security bug fix for information leak vulnerability CVE CAN-2005-0088. + + -- Peter Hawkins Fri, 11 Feb 2005 22:23:27 +1100 + +libapache2-mod-python (3.1.3-2.2) unstable; urgency=high + + * NMU, reverting the LFS transition made in the previous upload + * Bump apache2 build-dep to (>= 2.0.50-10) + + -- Adam Conrad Sat, 21 Aug 2004 05:51:54 -0600 + +libapache2-mod-python (3.1.3-2.1) unstable; urgency=medium + + * NMU for apache2 LFS transition (closes: #266188) + * Bump apache2-threaded-dev build-dep to (>= 2.0.50-9) + + -- Adam Conrad Tue, 17 Aug 2004 08:16:34 -0600 + +libapache2-mod-python (3.1.3-2) unstable; urgency=low + + * Added python to the build dependencies. (closes: #259327) + * Added dependency on apache2 for libapache2-mod-python2.[23]. + (closes: #252403) + * Added French and Japanese debconf translations. + (closes: #243656, #258787) + + -- Peter Hawkins Wed, 14 Jul 2004 17:01:04 +1000 + +libapache2-mod-python (3.1.3-1) unstable; urgency=low + + * New upstream release (closes: #236889, #241320) + * debian/*.templates, debian/control: Updated package to make it + compatible with po2debconf. + + -- Peter Hawkins Thu, 1 Apr 2004 21:54:32 +1000 + +libapache2-mod-python (3.0.4-2) unstable; urgency=low + + * debian/control: Change apache2-dev build dependency to + apache2-threaded-dev, since apache2-dev became a virtual package. + (closes: #225179) + + -- Peter Hawkins Sun, 28 Dec 2003 10:30:39 +1100 + +libapache2-mod-python (3.0.4-1) unstable; urgency=low + + * New upstream version, which fixes segmentation faults on empty query + string components when using the publisher handler. + * debian/rules: Build binary-all packages in the binary-indep target, + not in binary-arch (closes: #214267) + + -- Peter Hawkins Thu, 13 Nov 2003 16:50:23 +1100 + +libapache2-mod-python (3.0.3-3) unstable; urgency=medium + + * Fixed autoconf invocation from debian/rules. + + -- Peter Hawkins Sun, 5 Oct 2003 13:29:10 +1000 + +libapache2-mod-python (3.0.3-2) unstable; urgency=medium + + * Acknowledge NMUs (closes: #208278, #206197, #206661). + * Update standards version to 3.6.1 + * Removed build dependency on apache2. + + -- Peter Hawkins Sat, 4 Oct 2003 10:58:18 +1000 + +libapache2-mod-python (3.0.3-1.2) unstable; urgency=low + + * NMU. + * Add build dependency on python2.3-dev (closes: #208278). + + -- Matthias Klose Mon, 1 Sep 2003 23:38:03 +0200 + +libapache2-mod-python (3.0.3-1.1) unstable; urgency=low + + * NMU. + * Build libapache2-mod-python2.3 package (closes: #206197, #206661). + + -- Matthias Klose Tue, 26 Aug 2003 07:20:27 +0200 + +libapache2-mod-python (3.0.3-1) unstable; urgency=low + + * New upstream release. (closes: #190906) + * Added debconf support for enabling/disabling the apache module. + * debian/control: Updated standards version to 3.5.10. + * debian/rules: Now we use apxs2 from a recent apache2-dev correctly, so the + package builds again. (closes: #193362) + * debian/control: Fixed typo in conflicts line for libapache2-mod-python2.2. + + -- Peter Hawkins Thu, 29 May 2003 15:57:36 +1000 + +libapache2-mod-python (3.0.1-2) unstable; urgency=low + + * Changed description field so that it no longer mentions PyApache, + which was an obsolete reference (closes: #171668) + * libapache-mod-python now has a versioned dependency on + libapache-mod-python2.2 + * Fixed postinst and prerm scripts so they don't stomp on + the /etc/apache2/mods-available symlink. + * Changed standards version to 3.5.8 + + -- Peter Hawkins Thu, 5 Dec 2002 17:35:45 +1100 + +libapache2-mod-python (3.0.1-1) unstable; urgency=low + + * New upstream release 3.0.1. Uploaded package to unstable. + + -- Peter Hawkins Wed, 27 Nov 2002 17:31:48 +1100 + +libapache2-mod-python (2.9.999.4-1) unstable; urgency=low + + * New upstream release 3.0.0 beta 4. + + -- Peter Hawkins Thu, 31 Oct 2002 09:23:58 +1100 + +libapache2-mod-python (2.9.999.3-3) unstable; urgency=low + + * Patch from upstream to fix segfault in table_dealloc. + + -- Peter Hawkins Wed, 30 Oct 2002 10:36:16 +1100 + +libapache2-mod-python (2.9.999.3-2) unstable; urgency=low + + * Fixed postrm scripts. + + -- Peter Hawkins Sun, 20 Oct 2002 10:50:02 +1000 + +libapache2-mod-python (2.9.999.3-1) unstable; urgency=low + + * Updated package to mod_python 3.0.0 beta 3. + * Fixed a few bugs in Makefiles and package scripts. + + -- Peter Hawkins Wed, 16 Oct 2002 10:55:41 +1000 + +libapache2-mod-python (2.9.999.2-1) unstable; urgency=low + + * Initial package of mod_python 3.0.0 beta 2. + + -- Peter Hawkins Sun, 13 Oct 2002 13:20:16 +1000 --- libapache2-mod-python-3.3.1.orig/debian/copyright +++ libapache2-mod-python-3.3.1/debian/copyright @@ -0,0 +1,84 @@ +This package was debianized by Peter Hawkins on +Wed Nov 27 22:20:47 EST 2002. + +It's currently maintained by Robert S. Edmonds and +Norbert Tretkowski . + +It was downloaded from: +http://www.apache.org/dist/httpd/modpython/ + +Upstream Author: Gregory Trubetskoy + +Copyright: +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000-2002 The Apache Software Foundation. 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 the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * "mod_python", or "modpython", nor may these terms appear in their + * name, without prior written permission of the Apache Software + * Foundation. + * + * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION OR + * ITS 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 consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * Originally developed by Gregory Trubetskoy. + * + * + * 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/ + * + */ --- libapache2-mod-python-3.3.1.orig/debian/compat +++ libapache2-mod-python-3.3.1/debian/compat @@ -0,0 +1 @@ +5 --- libapache2-mod-python-3.3.1.orig/debian/watch +++ libapache2-mod-python-3.3.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.apache.org/dist/httpd/modpython/mod_python-(.*)\.tgz --- libapache2-mod-python-3.3.1.orig/debian/README.Debian +++ libapache2-mod-python-3.3.1/debian/README.Debian @@ -0,0 +1,12 @@ +libapache2-mod-python for Debian +------------------------------- + +This package has been split into several components: +libapache2-mod-python - module for currently supported python version +libapache2-mod-python-doc - documentation for this package (to avoid duplication of the +~700k uncompressed of docs in the archive). + +The HTML documentation can now be found at: +/usr/share/doc/libapache2-mod-python-doc/doc-html/ + + -- Peter Hawkins --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python-doc.doc-base +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python-doc.doc-base @@ -0,0 +1,15 @@ +Document: libapache2-mod-python-doc +Title: Apache Mod_python Manual +Author: Gregory Trubetskoy +Abstract: Mod_python allows embedding Python within the Apache server for a + considerable boost in performance and added flexibility in designing web based + applications. + . + This document aims to be the only necessary and authoritative source + of information about mod_python, usable as a comprehensive reference, a + user guide and a tutorial all-in-one. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/libapache2-mod-python-doc/doc-html/index.html +Files: /usr/share/doc/libapache2-mod-python-doc/doc-html/*.html --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python.dirs +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python.dirs @@ -0,0 +1,2 @@ +/usr/lib/apache2/modules +/etc/apache2/mods-available --- libapache2-mod-python-3.3.1.orig/debian/libapache2-mod-python.docs +++ libapache2-mod-python-3.3.1/debian/libapache2-mod-python.docs @@ -0,0 +1,3 @@ +debian/README.Debian +NEWS +README --- libapache2-mod-python-3.3.1.orig/debian/patches/03_includes.dpatch +++ libapache2-mod-python-3.3.1/debian/patches/03_includes.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_includes.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Additional INCLUDES + +@DPATCH@ + +diff -Nur mod_python-3.2.8.orig/src/Makefile.in mod_python-3.2.8/src/Makefile.in +--- mod_python-3.2.8.orig/src/Makefile.in 2005-06-26 08:52:26.000000000 -0500 ++++ mod_python-3.2.8/src/Makefile.in 2006-05-16 08:32:47.000000000 -0500 +@@ -22,7 +22,7 @@ + + # requires flex 2.5.31 for reentrant support + LEX=@LEX@ +-INCLUDES=@INCLUDES@ ++INCLUDES=@INCLUDES@ $(DEB_DEFINES) + LIBS=@LIBS@ + LDFLAGS=@LDFLAGS@ + OPT= --- libapache2-mod-python-3.3.1.orig/debian/patches/00list +++ libapache2-mod-python-3.3.1/debian/patches/00list @@ -0,0 +1,4 @@ +01_configure +02_makefile +03_includes +10_bts521965 --- libapache2-mod-python-3.3.1.orig/debian/patches/10_bts521965.dpatch +++ libapache2-mod-python-3.3.1/debian/patches/10_bts521965.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_bts521965.dpatch by Sandro Tosi +## +## DP: fix a FTBFS due to new apr > 1.3.x (bb is the bucket brigade) +## DP: From: http://www.modpython.org/pipermail/mod_python/2008-October/025724.html + +@DPATCH@ +diff -urNad libapache2-mod-python~/src/connobject.c libapache2-mod-python/src/connobject.c +--- libapache2-mod-python~/src/connobject.c 2006-12-03 05:36:37.000000000 +0100 ++++ libapache2-mod-python/src/connobject.c 2009-07-07 11:39:36.000000000 +0200 +@@ -139,7 +139,7 @@ + bytes_read = 0; + + while ((bytes_read < len || len == 0) && +- !(b == APR_BRIGADE_SENTINEL(b) || ++ !(b == APR_BRIGADE_SENTINEL(bb) || + APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { + + const char *data; --- libapache2-mod-python-3.3.1.orig/debian/patches/02_makefile.dpatch +++ libapache2-mod-python-3.3.1/debian/patches/02_makefile.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_makefile.dpatch by Peter Hawkins +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch makefile in setup.py call + +@DPATCH@ + +diff -Nur mod_python-3.2.8.orig/dist/Makefile.in mod_python-3.2.8/dist/Makefile.in +--- mod_python-3.2.8.orig/dist/Makefile.in 2005-10-15 10:43:35.000000000 -0500 ++++ mod_python-3.2.8/dist/Makefile.in 2006-05-16 08:31:15.000000000 -0500 +@@ -36,7 +36,7 @@ + if test -z "$(DESTDIR)" ; then \ + $(PYTHON_BIN) setup.py install --optimize 2 --force ; \ + else \ +- $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \ ++ $(PYTHON_BIN) setup.py install --force --root $(DESTDIR) --no-compile ; \ + fi + + mod_python.so: --- libapache2-mod-python-3.3.1.orig/debian/patches/01_configure.dpatch +++ libapache2-mod-python-3.3.1/debian/patches/01_configure.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_configure.dpatch by Robert S. Edmonds +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch configure script + +@DPATCH@ + +diff -Nur libapache2-mod-python-3.2.10.orig/configure.in libapache2-mod-python-3.2.10/configure.in +--- libapache2-mod-python-3.2.10.orig/configure.in 2006-04-12 14:03:09.000000000 +0200 ++++ libapache2-mod-python-3.2.10/configure.in 2006-08-18 23:44:37.000000000 +0200 +@@ -107,15 +107,17 @@ + ALL="dso" + + # check Apache version +- AC_MSG_CHECKING(Apache version) +- HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`" +- ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'` +- AC_MSG_RESULT($ver) ++# peterh: Remove apache version check for debian package, since we don't ++# want to build-depend on apache2. ++# AC_MSG_CHECKING(Apache version) ++# HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`" ++# ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'` ++# AC_MSG_RESULT($ver) + + # make sure version begins with 2 +- if test -z "`echo $ver | egrep \^2`"; then +- AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.]) +- fi ++# if test -z "`echo $ver | egrep \^2`"; then ++# AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.]) ++# fi + + # determine LIBEXEC + AC_MSG_CHECKING(for Apache libexec directory) +@@ -287,7 +289,7 @@ + # get the mod_python version + AC_SUBST(MP_VERSION) + MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h` +-MP_VERSION=`echo $MP_VERSION | sed 's/["]//g'` ++MP_VERSION=`echo $MP_VERSION | sed 's/"//g'` + + # get --with-python-src. The python src is required to generate the documentation + # It is not required to compile or install mod_python itself --- libapache2-mod-python-3.3.1.orig/debian/source/format +++ libapache2-mod-python-3.3.1/debian/source/format @@ -0,0 +1 @@ +1.0