[Python-modules-commits] r9833 - in packages/python-docutils/trunk/debian (3 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Tuesday, September 22, 2009 @ 21:51:58
  Author: jwilk-guest
Revision: 9833

Fix the fix for Python 2.6 transition (recent Python is not required anymore).

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2009-09-22 21:51:15 UTC (rev 9832)
+++ packages/python-docutils/trunk/debian/changelog	2009-09-22 21:51:58 UTC (rev 9833)
@@ -1,11 +1,9 @@
 python-docutils (0.5-5) UNRELEASED; urgency=low
 
-  * Prepare for Python 2.6 transition (closes: #547841):
-    - add --install-layout=deb to setup.py calls;
-    - add build dependency on python (>= 2.5.4-1~).
+  * Prepare for Python 2.6 transition (closes: #547841).
   * Bump Standards-Version to 3.8.3 (no changes needed).
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 22 Sep 2009 23:36:12 +0200
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 22 Sep 2009 23:48:45 +0200
 
 python-docutils (0.5-4) unstable; urgency=medium
 

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2009-09-22 21:51:15 UTC (rev 9832)
+++ packages/python-docutils/trunk/debian/control	2009-09-22 21:51:58 UTC (rev 9833)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: martin f. krafft <madduck at debian.org>, Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-setuptools (>= 0.6b3), python (>= 2.5.4-1~)
+Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-setuptools (>= 0.6b3), python (>= 2.3)
 Build-Depends-Indep: python-dev, xsltproc (>= 1.1.20), python-support (>= 0.6.4)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2009-09-22 21:51:15 UTC (rev 9832)
+++ packages/python-docutils/trunk/debian/rules	2009-09-22 21:51:58 UTC (rev 9833)
@@ -5,6 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include /usr/share/python/python.mk
 include /usr/share/dpatch/dpatch.make
 
 p	= python-docutils
@@ -52,9 +53,9 @@
 	dh_installdirs
 	mkdir -p debian/tmp
 	$(PYTHON) setup.py install \
-	    --root debian/tmp --no-compile --install-layout=deb
+	    --root debian/tmp --no-compile $(py_setup_install_args)
 	$(PYTHON) setup_roman.py install \
-	    --root debian/tmp --no-compile --install-layout=deb
+	    --root debian/tmp --no-compile $(py_setup_install_args)
 	: # give scripts canonical names in /usr/bin
 	cd debian/tmp/usr/bin && \
 	mv rst2newlatex.py rst2newlatex && \