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

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

    Date: Thursday, June 4, 2009 @ 23:32:56
  Author: gilir-guest
Revision: 8730

Merge Ubuntu changes for Python 2.6 transition

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

Modified: packages/zsi/trunk/debian/changelog
===================================================================
--- packages/zsi/trunk/debian/changelog	2009-06-04 23:32:50 UTC (rev 8729)
+++ packages/zsi/trunk/debian/changelog	2009-06-04 23:32:56 UTC (rev 8730)
@@ -1,10 +1,20 @@
 zsi (2.1~a1-3) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:16:55 +0100
+  [ 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-all (>= 2.5.4-1~)
+    + Bump build-depends to debhelper (>= 5.0.38)
+  * debian/control : Drop obsolete depends on python-xml 
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 23:39:50 +0200
+
 zsi (2.1~a1-2) unstable; urgency=medium
 
   [ Emilio Pozuelo Monfort ]

Modified: packages/zsi/trunk/debian/control
===================================================================
--- packages/zsi/trunk/debian/control	2009-06-04 23:32:50 UTC (rev 8729)
+++ packages/zsi/trunk/debian/control	2009-06-04 23:32:56 UTC (rev 8730)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Tristan Seligmann <mithrandi at mithrandi.net>, Bernd Zeimetz <bzed at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), python-all, dpatch
+Build-Depends: debhelper (>= 5.0.38), python-all (>= 2.5.4-1~), dpatch
 Build-Depends-Indep: python-support (>= 0.4)
 Homepage: http://pywebsvcs.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/zsi/trunk/
@@ -12,7 +12,7 @@
 
 Package: python-zsi
 Architecture: all
-Depends: python-xml, ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Conflicts: python2.3-zsi (<= 1.5.0-3), python2.4-zsi (<= 1.5.0-3)
 Replaces: python2.3-zsi (<= 1.5.0-3), python2.4-zsi (<= 1.5.0-3)
 Provides: ${python:Provides}

Modified: packages/zsi/trunk/debian/rules
===================================================================
--- packages/zsi/trunk/debian/rules	2009-06-04 23:32:50 UTC (rev 8729)
+++ packages/zsi/trunk/debian/rules	2009-06-04 23:32:56 UTC (rev 8730)
@@ -57,7 +57,7 @@
 	dh_installdirs
 	set -e; \
 	for py in $(PYVERS); do  \
-	    $$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME); \
+	    $$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME) --install-layout=deb; \
 	done
 
 	dh_installdocs -A