[Python-modules-commits] r20708 - in packages/libapache2-mod-python/trunk/debian (3 files)

Fri Mar 9 19:00:24 UTC 2012

Date: Friday, March 9, 2012 @ 19:00:22
  Author: adejong
Revision: 20708

  * Update Vcs-Browser field.
  * Switch to dh_python2 based on the patch in Ubuntu. (Closes: #616858,
    LP: #788514)

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
===================================================================

--- packages/libapache2-mod-python/trunk/debian/changelog	2012-03-09 17:05:01 UTC (rev 20707)
+++ packages/libapache2-mod-python/trunk/debian/changelog	2012-03-09 19:00:22 UTC (rev 20708)
@@ -1,3 +1,11 @@
+libapache2-mod-python (3.3.1-10) UNRELEASED; urgency=low
+
+  * Update Vcs-Browser field.
+  * Switch to dh_python2 based on the patch in Ubuntu. (Closes: #616858,
+    LP: #788514)
+
+ -- Arthur de Jong <adejong at debian.org>  Fri, 09 Mar 2012 19:59:47 +0100
+
 libapache2-mod-python (3.3.1-9) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -322,7 +330,7 @@
 
   * New upstream release (closes: #236889, #241320)
   * debian/*.templates, debian/control: Updated package to make it
-    compatible with po2debconf. 
+    compatible with po2debconf.
 
  -- Peter Hawkins <peterh at debian.org>  Thu,  1 Apr 2004 21:54:32 +1000
 
@@ -378,7 +386,7 @@
   * 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. 
+  * debian/control: Fixed typo in conflicts line for libapache2-mod-python2.2.
 
  -- Peter Hawkins <peterh at debian.org>  Thu, 29 May 2003 15:57:36 +1000
 
@@ -408,7 +416,7 @@
 
 libapache2-mod-python (2.9.999.3-3) unstable; urgency=low
 
-  * Patch from upstream to fix segfault in table_dealloc. 
+  * Patch from upstream to fix segfault in table_dealloc.
 
  -- Peter Hawkins <peterh at debian.org>  Wed, 30 Oct 2002 10:36:16 +1100
 

Modified: packages/libapache2-mod-python/trunk/debian/control
===================================================================
--- packages/libapache2-mod-python/trunk/debian/control	2012-03-09 17:05:01 UTC (rev 20707)
+++ packages/libapache2-mod-python/trunk/debian/control	2012-03-09 19:00:22 UTC (rev 20708)
@@ -3,14 +3,13 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Robert S. Edmonds <edmonds at debian.org>
-Build-Depends: debhelper (>= 5.0.38), autoconf, python-dev (>= 2.4.3-11),
- apache2-threaded-dev (>= 2.2.3-1), dpatch, python-central (>= 0.5.6)
-XS-Python-Version: current
+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/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/libapache2-mod-python/trunk/
 Homepage: http://www.modpython.org/
 Standards-Version: 3.8.4
- 
+
 Package: libapache2-mod-python
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, apache2.2-common, apache2
@@ -19,7 +18,6 @@
 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
-XB-Python-Version: ${python:Versions}
 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

Modified: packages/libapache2-mod-python/trunk/debian/rules
===================================================================
--- packages/libapache2-mod-python/trunk/debian/rules	2012-03-09 17:05:01 UTC (rev 20707)
+++ packages/libapache2-mod-python/trunk/debian/rules	2012-03-09 19:00:22 UTC (rev 20708)
@@ -8,13 +8,13 @@
 
 include /usr/share/dpatch/dpatch.make
 
-PYVER=$(shell pyversions -rv)
+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 $@
@@ -57,7 +57,7 @@
 	-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=$(PYVER)
+		--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/
@@ -71,7 +71,7 @@
 	dh_installmenu -i
 	dh_installcron -i
 	dh_installinfo -i
-	dh_installchangelogs -i 
+	dh_installchangelogs -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -83,7 +83,7 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_pycentral -plibapache2-mod-python
+	dh_python2 -plibapache2-mod-python --no-guessing-versions
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a


