[Python-modules-commits] r1236 - in /packages/libapache2-mod-python/trunk/debian: ./ po/

pox-guest at users.alioth.debian.org pox-guest at users.alioth.debian.org
Tue Aug 1 08:25:09 UTC 2006 

Author: pox-guest
Date: Tue Aug  1 08:25:07 2006
New Revision: 1236

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1236
Log:
revert to 3.2.8-2

Added:
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.config
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.config
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.dirs
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.dirs
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.docs
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.docs
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postinst
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postinst
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postrm
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.postrm
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.templates
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.3.templates
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.config
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.config
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.dirs
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.dirs
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.docs
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.docs
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postinst
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postinst
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postrm
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.postrm
    packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.templates
      - copied unchanged from r1224, packages/libapache2-mod-python/trunk/debian/libapache2-mod-python2.4.templates
Removed:
    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/po/nl.po
    packages/libapache2-mod-python/trunk/debian/po/pl.po
    packages/libapache2-mod-python/trunk/debian/pycompat
Modified:
    packages/libapache2-mod-python/trunk/debian/README.Debian
    packages/libapache2-mod-python/trunk/debian/changelog
    packages/libapache2-mod-python/trunk/debian/control
    packages/libapache2-mod-python/trunk/debian/po/POTFILES.in
    packages/libapache2-mod-python/trunk/debian/po/fr.po
    packages/libapache2-mod-python/trunk/debian/rules
    packages/libapache2-mod-python/trunk/debian/watch

Modified: packages/libapache2-mod-python/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/README.Debian?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/README.Debian (original)
+++ packages/libapache2-mod-python/trunk/debian/README.Debian Tue Aug  1 08:25:07 2006
@@ -2,7 +2,9 @@
 -------------------------------
 
 This package has been split into several components:
-libapache2-mod-python - module for currently supported python version
+libapache2-mod-python - dummy package depending on libapache-mod-python2.3
+libapache2-mod-python2.3 - module for python2.3
+libapache2-mod-python2.4 - module for python2.3
 libapache2-mod-python-doc - documentation for this package (to avoid duplication of the
 ~700k uncompressed of docs in the archive).
 

Modified: packages/libapache2-mod-python/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/changelog?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog (original)
+++ packages/libapache2-mod-python/trunk/debian/changelog Tue Aug  1 08:25:07 2006
@@ -1,17 +1,3 @@
-libapache2-mod-python (3.2.8-3) unstable; urgency=low
-
-  [ Jeremie Corbier ]
-  * New python policy transition. (closes: #373561, #370276)
-  * Added initial dutch debconf translation from Vincent Zweije.
-    (closes: #368649)
-  * Updated french debconf translation from Jean-Luc Coulon.
-    (closes: #376547)
-
-  [ Piotr Ozarowski ]
-  * Added initial polish debconf translation.
-
- -- Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr>  Mon, 31 Jul 2006 23:57:48 +0200
-
 libapache2-mod-python (3.2.8-2) unstable; urgency=medium
 
   [ Norbert Tretkowski ]
@@ -21,7 +7,7 @@
 
   [ Robert S. Edmonds ]
   * Patching the generated configure script is wrong and unnecessary.
-    (closes: #370234, #375582)
+    (closes: #370234)
 
   [ Piotr Ozarowski ]
   * Added watch file.

Modified: packages/libapache2-mod-python/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/control?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/control (original)
+++ packages/libapache2-mod-python/trunk/debian/control Tue Aug  1 08:25:07 2006
@@ -3,24 +3,19 @@
 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.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
+Build-Depends: debhelper (>= 5.0.17), debconf, autoconf, python, python2.3-dev, python2.4-dev, apache2-threaded-dev (>= 2.0.50-10), dpatch
 Standards-Version: 3.7.2.0
  
 Package: libapache2-mod-python
-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}
+Architecture: all
+Depends: libapache2-mod-python2.3 (>= ${Source-Version}), python (>= 2.3), python (<< 2.4)
 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 package is built for the current Python version.
+ This is a dummy package which depends on the package corresponding to the
+ default python version.
 
 Package: libapache2-mod-python-doc
 Architecture: all
@@ -31,3 +26,27 @@
  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.

Modified: packages/libapache2-mod-python/trunk/debian/po/POTFILES.in
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/po/POTFILES.in?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/po/POTFILES.in (original)
+++ packages/libapache2-mod-python/trunk/debian/po/POTFILES.in Tue Aug  1 08:25:07 2006
@@ -1,1 +1,2 @@
-[type: gettext/rfc822deb] libapache2-mod-python.templates
+[type: gettext/rfc822deb] libapache2-mod-python2.3.templates
+[type: gettext/rfc822deb] libapache2-mod-python2.4.templates

Modified: packages/libapache2-mod-python/trunk/debian/po/fr.po
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/po/fr.po?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/po/fr.po (original)
+++ packages/libapache2-mod-python/trunk/debian/po/fr.po Tue Aug  1 08:25:07 2006
@@ -13,10 +13,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libapache2-mod-python 3.2.8\n"
-"Report-Msgid-Bugs-To: python-modules-team at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-05-16 18:51-0500\n"
-"PO-Revision-Date: 2006-07-03 17:40+0200\n"
+"Project-Id-Version: libapache2-mod-python 3.1.3\n"
+"POT-Creation-Date: 2004-04-01 21:50+1000\n"
+"PO-Revision-Date: 2005-09-23 15:49+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,36 +24,40 @@
 
 #. Type: boolean
 #. Description
+#: ../libapache2-mod-python2.2.templates:3
 #: ../libapache2-mod-python2.3.templates:3
-#: ../libapache2-mod-python2.4.templates:3
 msgid "Enable the Apache 2 mod_python module?"
-msgstr "Faut-il activer le module mod_python pour Apache2 ?"
+msgstr "Faut-il installer le module mod_python pour Apache2 ?"
 
 #. Type: boolean
 #. Description
+#: ../libapache2-mod-python2.2.templates:3
 #: ../libapache2-mod-python2.3.templates:3
-#: ../libapache2-mod-python2.4.templates:3
-msgid "You need to enable the module to use websites written for mod_python."
+msgid ""
+"Should the mod_python module be enabled in your Apache 2 configuration? You "
+"need to enable the module to use websites written for mod_python."
 msgstr ""
-"Vous devez activer le module pour pouvoir utiliser des sites web écrits pour "
-"mod_python."
+"Veuillez choisir si vous souhaitez installer le module « mod_python » dans "
+"votre configuration d'Apache2. Ce module est indispensable pour pouvoir "
+"utiliser des sites web écrits pour mod_python."
 
 #. Type: boolean
 #. Description
+#: ../libapache2-mod-python2.2.templates:3
 #: ../libapache2-mod-python2.3.templates:3
-#: ../libapache2-mod-python2.4.templates:3
 msgid ""
-"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."
+"If you answer yes to this question, a symbolic link will be made for "
+"mod_python in /etc/apache2/mods-enabled/. If you answer no, the symbolic "
+"link will be deleted."
 msgstr ""
-"Si vous choisissez d'installer le module, un lien symbolique sera créé pour "
-"mod_python dans /etc/apache2/mods-enabled/, ce lien sera supprimé dans le cas "
-"contraire."
+"Si vous choisissez cette option, un lien symbolique sera créé pour "
+"mod_python dans /etc/apache2/mods-enabled/. Dans le cas contraire, le lien "
+"symbolique sera détruit."
 
 #. Type: boolean
 #. Description
+#: ../libapache2-mod-python2.2.templates:3
 #: ../libapache2-mod-python2.3.templates:3
-#: ../libapache2-mod-python2.4.templates:3
 msgid ""
 "NB. You will need to restart Apache 2 manually after changing this option."
 msgstr ""

Modified: packages/libapache2-mod-python/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/rules?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/rules (original)
+++ packages/libapache2-mod-python/trunk/debian/rules Tue Aug  1 08:25:07 2006
@@ -10,8 +10,6 @@
 
 # This is the debhelper compatability version to use.
 export DH_COMPAT=5
-
-PYVER=$(shell pyversions -rv)
 
 configure: configure-stamp
 configure-stamp:
@@ -57,21 +55,34 @@
 
 	autoconf
 
+	# python 2.3
 	rm -f config.cache config.status
-	export PYTHON_BIN=/usr/bin/python
-	-env PYTHON_BIN=/usr/bin/python \
+	export PYTHON_BIN=/usr/bin/python2.3
+	-env PYTHON_BIN=/usr/bin/python2.3 \
 	./configure --with-apxs=/usr/bin/apxs2 --prefix=/usr \
 		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		--with-python-version=$(PYVER)
+		--with-python-version=2.3
 	$(MAKE) clean && DEB_DEFINES="-DLONG_LONG=PY_LONG_LONG" $(MAKE)
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python
-	cp debian/mod_python.load debian/libapache2-mod-python/etc/apache2/mods-available/
+	$(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/
 
 
 # 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
@@ -96,8 +107,8 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_pycentral -plibapache2-mod-python
-	dh_python -plibapache2-mod-python
+	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_installdebconf -a	
 	dh_installdocs -a
 	dh_installexamples -a

Modified: packages/libapache2-mod-python/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/watch?rev=1236&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/watch (original)
+++ packages/libapache2-mod-python/trunk/debian/watch Tue Aug  1 08:25:07 2006
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/httpd/modpython/mod_python-(.*)\.tgz
+http://www.apache.org/dist/httpd/modpython/ mod_python-(.*)\.tgz

More information about the Python-modules-commits mailing list