[Python-modules-commits] r3403 - in /packages/mod-wsgi/trunk/debian: changelog control libapache2-mod-wsgi.postinst libapache2-mod-wsgi.prerm libapache2-mod-wsgi.rtupdate rules
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Sat Oct 6 11:41:42 UTC 2007
Author: bzed-guest
Date: Sat Oct 6 11:41:42 2007
New Revision: 3403
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3403
Log:
* Applying a patch from Josselin Mouette - thanks, introducing the
following changes
- Build the module for all supported python versions.
- Ship a rtupdate script to rotate to the new version when the python
version changes.
- Build-depend on python-all-dev.
(Closes: #445486)
Added:
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.rtupdate
Modified:
packages/mod-wsgi/trunk/debian/changelog
packages/mod-wsgi/trunk/debian/control
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm
packages/mod-wsgi/trunk/debian/rules
Modified: packages/mod-wsgi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/changelog?rev=3403&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/changelog (original)
+++ packages/mod-wsgi/trunk/debian/changelog Sat Oct 6 11:41:42 2007
@@ -1,3 +1,15 @@
+mod-wsgi (1.1-2) unstable; urgency=low
+
+ * Applying a patch from Josselin Mouette - thanks, introducing the
+ following changes
+ - Build the module for all supported python versions.
+ - Ship a rtupdate script to rotate to the new version when the python
+ version changes.
+ - Build-depend on python-all-dev.
+ (Closes: #445486)
+
+ -- Bernd Zeimetz <bernd at bzed.de> Sat, 06 Oct 2007 13:27:39 +0200
+
mod-wsgi (1.1-1) unstable; urgency=low
* New upstream version
Modified: packages/mod-wsgi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/control?rev=3403&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/control (original)
+++ packages/mod-wsgi/trunk/debian/control Sat Oct 6 11:41:42 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bernd at bzed.de>
-Build-Depends: debhelper (>= 5), python-dev, apache2-threaded-dev, dpatch
+Build-Depends: debhelper (>= 5), python-all-dev, apache2-threaded-dev, dpatch
Homepage: http://www.modwsgi.org/
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/mod-wsgi/trunk/
Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst?rev=3403&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst (original)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst Sat Oct 6 11:41:42 2007
@@ -1,6 +1,11 @@
#!/bin/sh
set -e
+
+/usr/share/python/runtime.d/libapache2-mod-wsgi.rtupdate \
+ rtupdate \
+ pouet \
+ $(pyversions -d)
apache_force_reload() {
if apache2ctl configtest 2>/dev/null; then
Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm?rev=3403&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm (original)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.prerm Sat Oct 6 11:41:42 2007
@@ -6,6 +6,8 @@
a2dismod mod-wsgi || true
fi
+rm -f /usr/lib/apache2/modules/mod_wsgi.so
+
#DEBHELPER#
exit 0
Added: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.rtupdate
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.rtupdate?rev=3403&op=file
==============================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.rtupdate (added)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.rtupdate Sat Oct 6 11:41:42 2007
@@ -1,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = rtupdate ]; then
+ new_version=${3#python}
+ ln -sf mod_wsgi.so-${new_version} /usr/lib/apache2/modules/mod_wsgi.so
+fi
Modified: packages/mod-wsgi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/rules?rev=3403&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/rules (original)
+++ packages/mod-wsgi/trunk/debian/rules Sat Oct 6 11:41:42 2007
@@ -10,44 +10,42 @@
include /usr/share/dpatch/dpatch.make
APXS2=/usr/bin/apxs2
-PY_VERSION=$(shell pyversions -vd)
-PY_NEXT_VERSION=$(shell echo $(PY_VERSION) | awk '{ print (($$1*10)+1)/10 }')
+PYVERS=$(shell pyversions -vs)
+PYMIN=$(shell echo $(PYVERS) | awk '{print $$1}')
+PYMAX=$(shell echo $(PYVERS) | LANG=C awk '{print $$NF+0.1}')
-config.status: configure patch
+build-%/config.status:
dh_testdir
+ mkdir -p build-$*
+ cp *.in *.c configure build-$*/
+ cd build-$* && ./configure --with-apxs=$(APXS2) \
+ --with-python=/usr/bin/python$*
- ./configure --with-apxs=$(APXS2) \
- --with-python=/usr/bin/python$(PY_VERSION)
-
-
-build: build-stamp
-
-build-stamp: config.status
+build-%/build-stamp: build-%/config.status
dh_testdir
-
- $(MAKE)
-
+ $(MAKE) -C build-$*
touch $@
-clean: clean-patched unpatch
+build: patch $(PYVERS:%=build-%/build-stamp)
-clean-patched:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
+ rm -rf build-*
dh_clean
-install: build
+install-clean:
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/$(PACKAGE) install
+install-%: build-%/build-stamp
+ $(MAKE) -C build-$* DESTDIR=$(CURDIR)/debian/$(PACKAGE) install
+ mv $(CURDIR)/debian/$(PACKAGE)/usr/lib/apache2/modules/mod_wsgi.so \
+ $(CURDIR)/debian/$(PACKAGE)/usr/lib/apache2/modules/mod_wsgi.so-$*
+
+install: build install-clean $(PYVERS:%=install-%)
# Build architecture-independent files here.
binary-indep: build install
@@ -59,18 +57,20 @@
dh_installchangelogs
dh_installdocs
dh_install
+ install -d -m 755 debian/$(PACKAGE)/usr/share/python/runtime.d
+ install -m 755 debian/*.rtupdate debian/$(PACKAGE)/usr/share/python/runtime.d/
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
+ # Ugh, ignore libpython dependencies
+ ( for i in $(PYVERS); do echo libpython$$i 1.0; done ) > debian/shlibs.local
dh_shlibdeps
- #We wan't to make sure that mod-wsgi depends on the default
- #python version as most people won't take care of it.
- #This way should ensure that the package is binNMU-able when
- #Debian switches to a new default Py version.
- echo 'python:Depends=python (>= $(PY_VERSION)), python (<< $(PY_NEXT_VERSION))' \
+ rm -f debian/shlibs.local
+ # Generate dependencies manually as there are no public modules
+ echo 'python:Depends=python (>= $(PYMIN)), python (<< $(PYMAX))' \
>> $(CURDIR)/debian/$(PACKAGE).substvars
dh_gencontrol
dh_md5sums
More information about the Python-modules-commits
mailing list