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

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

    Date: Tuesday, September 22, 2009 @ 21:17:22
  Author: jwilk-guest
Revision: 9827

Prepare for Python 2.6 transition.

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2009-09-22 12:35:41 UTC (rev 9826)
+++ packages/python-docutils/trunk/debian/changelog	2009-09-22 21:17:22 UTC (rev 9827)
@@ -1,3 +1,11 @@
+python-docutils (0.5-5) UNRELEASED; urgency=low
+
+  * Prepare for Python 2.6 transition:
+    - add --install-layout=deb to setup.py calls;
+    - add build dependency on python (>= 2.5.4-1~).
+
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 22 Sep 2009 23:00:15 +0200
+
 python-docutils (0.5-4) unstable; urgency=medium
 
   [ Jakub Wilk ]

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2009-09-22 12:35:41 UTC (rev 9826)
+++ packages/python-docutils/trunk/debian/control	2009-09-22 21:17:22 UTC (rev 9827)
@@ -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.3)
+Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-setuptools (>= 0.6b3), python (>= 2.5.4-1~)
 Build-Depends-Indep: python-dev, xsltproc (>= 1.1.20), python-support (>= 0.6.4)
 Standards-Version: 3.8.2
 XS-Python-Version: >= 2.3

Modified: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install	2009-09-22 12:35:41 UTC (rev 9826)
+++ packages/python-docutils/trunk/debian/python-docutils.install	2009-09-22 21:17:22 UTC (rev 9827)
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/python*.*/site-packages/docutils*.egg-info
-debian/tmp/usr/lib/python*.*/site-packages/docutils
+debian/tmp/usr/lib/python*.*/*-packages/docutils*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/docutils
 tools/editors/emacs/rst.el usr/share/emacs/site-lisp
 debian/50python-docutils.el etc/emacs/site-start.d
 debian/tmp/usr/bin/*

Modified: packages/python-docutils/trunk/debian/python-roman.install
===================================================================
--- packages/python-docutils/trunk/debian/python-roman.install	2009-09-22 12:35:41 UTC (rev 9826)
+++ packages/python-docutils/trunk/debian/python-roman.install	2009-09-22 21:17:22 UTC (rev 9827)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python*.*/site-packages/roman.py
-debian/tmp/usr/lib/python*.*/site-packages/roman*.egg-info
+debian/tmp/usr/lib/python*.*/*-packages/roman.py
+debian/tmp/usr/lib/python*.*/*-packages/roman*.egg-info

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2009-09-22 12:35:41 UTC (rev 9826)
+++ packages/python-docutils/trunk/debian/rules	2009-09-22 21:17:22 UTC (rev 9827)
@@ -52,9 +52,9 @@
 	dh_installdirs
 	mkdir -p debian/tmp
 	$(PYTHON) setup.py install \
-	    --root debian/tmp --no-compile
+	    --root debian/tmp --no-compile --install-layout=deb
 	$(PYTHON) setup_roman.py install \
-	    --root debian/tmp --no-compile
+	    --root debian/tmp --no-compile --install-layout=deb
 	: # give scripts canonical names in /usr/bin
 	cd debian/tmp/usr/bin && \
 	mv rst2newlatex.py rst2newlatex && \