[Python-modules-commits] r8723 - in packages/logilab-astng/trunk/debian (3 files)

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

    Date: Thursday, June 4, 2009 @ 23:07:59
  Author: gilir-guest
Revision: 8723

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/logilab-astng/trunk/debian/changelog
  packages/logilab-astng/trunk/debian/control
  packages/logilab-astng/trunk/debian/rules

Modified: packages/logilab-astng/trunk/debian/changelog
===================================================================
--- packages/logilab-astng/trunk/debian/changelog	2009-06-04 22:54:47 UTC (rev 8722)
+++ packages/logilab-astng/trunk/debian/changelog	2009-06-04 23:07:59 UTC (rev 8723)
@@ -1,3 +1,16 @@
+logilab-astng (0.19.0-2) UNRELEASED; urgency=low
+
+  * From Ubuntu, prepare for the future python transition,
+    thanks Alessio Treglia for the patch (Closes: #530607)
+   - debian/rules: 
+    + Add --install-layout=deb to setup.py install
+    + Replace site-packages by *-packages
+   - debian/control: 
+    + Bump build-depends to python (>= 2.5.4-1~)
+    + Bump build-depends to debhelper (>= 5.0.38)
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 18:07:51 +0200
+
 logilab-astng (0.19.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/logilab-astng/trunk/debian/control
===================================================================
--- packages/logilab-astng/trunk/debian/control	2009-06-04 22:54:47 UTC (rev 8722)
+++ packages/logilab-astng/trunk/debian/control	2009-06-04 23:07:59 UTC (rev 8723)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sylvain Thénault <sylvain.thenault at logilab.fr>, Alexandre Fayolle <afayolle at debian.org>, Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.3.5-7)
+Build-Depends: debhelper (>= 5.0.38), python (>= 2.5.4-1~)
 Build-Depends-Indep: python-support
 XS-Python-Version: all
 Standards-Version: 3.8.1

Modified: packages/logilab-astng/trunk/debian/rules
===================================================================
--- packages/logilab-astng/trunk/debian/rules	2009-06-04 22:54:47 UTC (rev 8722)
+++ packages/logilab-astng/trunk/debian/rules	2009-06-04 23:07:59 UTC (rev 8723)
@@ -36,12 +36,14 @@
 	dh_clean -k
 	dh_installdirs
 
-	python setup.py -q install --no-compile --root=$(CURDIR)/debian/python-logilab-astng/
+	python setup.py -q install --no-compile \
+		--root=$(CURDIR)/debian/python-logilab-astng/ \
+		--install-layout=deb
 
 	# remove sub-package __init__ file (created in postinst)
-	rm debian/python-logilab-astng/usr/lib/python*/site-packages/logilab/__init__.py
+	rm debian/python-logilab-astng/usr/lib/python*/*-packages/logilab/__init__.py
 	# remove test directory (installed in a separated package)
-	rm -rf debian/python-logilab-astng/usr/lib/python*/site-packages/logilab/astng/test
+	rm -rf debian/python-logilab-astng/usr/lib/python*/*-packages/logilab/astng/test
 
 	# install tests
 	(cd test && find . -type f -not \( -path '*/CVS/*' -or -name '*.pyc' \) -exec install -D --mode=644 {} ../debian/python-logilab-astng/usr/share/doc/python-logilab-astng/test/{} \;)