[Python-modules-commits] r8721 - in packages/constraint/trunk/debian (changelog control rules)

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

    Date: Thursday, June 4, 2009 @ 22:43:43
  Author: gilir-guest
Revision: 8721

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/constraint/trunk/debian/changelog
  packages/constraint/trunk/debian/control
  packages/constraint/trunk/debian/rules

Modified: packages/constraint/trunk/debian/changelog
===================================================================
--- packages/constraint/trunk/debian/changelog	2009-06-04 22:21:49 UTC (rev 8720)
+++ packages/constraint/trunk/debian/changelog	2009-06-04 22:43:43 UTC (rev 8721)
@@ -5,8 +5,13 @@
     - renamed binary package to python-logilab-constraint, added Provides,
     Replaces, Conflicts for transition (closes: #523107)
 
- --
+  [ Julien Lavergne ]
+  * From Ubuntu, prepare for the future python transition:
+   - debian/rules: Add --install-layout=deb to setup.py install
+   - debian/control: Bump build-depends to python (>= 2.5.4-1~)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 15:47:30 +0200
+
 constraint (0.4.0-3) unstable; urgency=low
 
   [ Alexandre Fayolle ]

Modified: packages/constraint/trunk/debian/control
===================================================================
--- packages/constraint/trunk/debian/control	2009-06-04 22:21:49 UTC (rev 8720)
+++ packages/constraint/trunk/debian/control	2009-06-04 22:43:43 UTC (rev 8721)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Alexandre Fayolle <afayolle at debian.org> 
-Build-Depends-Indep: python-support, python (>= 2.3.5-7)
+Build-Depends-Indep: python-support, python (>= 2.5.4-1~)
 Build-Depends: debhelper (>= 5.0.38)
 XS-Python-Version: all
 Standards-Version: 3.8.1

Modified: packages/constraint/trunk/debian/rules
===================================================================
--- packages/constraint/trunk/debian/rules	2009-06-04 22:21:49 UTC (rev 8720)
+++ packages/constraint/trunk/debian/rules	2009-06-04 22:43:43 UTC (rev 8721)
@@ -33,7 +33,11 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	python setup.py -q install --no-compile --root=debian/python-constraint  --install-headers=debian/python-constraint/usr/include/ --install-scripts=usr/bin
+	python setup.py -q install --no-compile \
+		--root=debian/python-constraint  \
+		--install-headers=debian/python-constraint/usr/include/ \
+		--install-scripts=usr/bin \
+		--install-layout=deb
 	# remove sub-package __init__ file (created by another package)
 	rm debian/python-constraint/usr/lib/python*/site-packages/logilab/__init__.py
 	# remove test directory (installed in in the doc directory)