[Python-modules-commits] r8718 - in packages/py-sendfile/trunk/debian (changelog control rules)

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

    Date: Thursday, June 4, 2009 @ 22:07:21
  Author: gilir-guest
Revision: 8718

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/py-sendfile/trunk/debian/changelog
  packages/py-sendfile/trunk/debian/control
  packages/py-sendfile/trunk/debian/rules

Modified: packages/py-sendfile/trunk/debian/changelog
===================================================================
--- packages/py-sendfile/trunk/debian/changelog	2009-06-04 21:13:44 UTC (rev 8717)
+++ packages/py-sendfile/trunk/debian/changelog	2009-06-04 22:07:21 UTC (rev 8718)
@@ -1,5 +1,6 @@
 py-sendfile (1.2.4-1) UNRELEASED; urgency=low
 
+  [ Stephan Peijnik ]
   * New upstream release.
   * Switched Vcs-Browser field to viewsvn.
   * debian/control:
@@ -11,8 +12,13 @@
       .zip files.
   * NOT RELEASED YET
 
- -- Stephan Peijnik <debian at sp.or.at>  Thu, 02 Apr 2009 01:05:04 +0200
+  [ Julien Lavergne ]
+  * From Ubuntu, prepare for the future python transition:
+   + debian/rules: Add --install-layout=deb to setup.py install
+   + debian/control: Build-depends on python-all-dev (>= 2.5.4-1~)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 00:59:18 +0200
+
 py-sendfile (1.2.3-1) unstable; urgency=low
 
   * Initial release (Closes: #515564)

Modified: packages/py-sendfile/trunk/debian/control
===================================================================
--- packages/py-sendfile/trunk/debian/control	2009-06-04 21:13:44 UTC (rev 8717)
+++ packages/py-sendfile/trunk/debian/control	2009-06-04 22:07:21 UTC (rev 8718)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stephan Peijnik <debian at sp.or.at>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.4), python-support (>= 0.6.4), python-setuptools (>= 0.6b3), python-all-dbg
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.5.4-1~), python-support (>= 0.6.4), python-setuptools (>= 0.6b3), python-all-dbg
 Standards-Version: 3.8.0
 Homepage: http://code.sp-its.at/projects/py-sendfile
 XS-Python-Version: all
@@ -29,4 +29,4 @@
  python-sendfile provides an interface to sendfile(2) for Python modules
  and applications.
  .
- This package contains the extension built for the Python debug interpreter.
\ No newline at end of file
+ This package contains the extension built for the Python debug interpreter.

Modified: packages/py-sendfile/trunk/debian/rules
===================================================================
--- packages/py-sendfile/trunk/debian/rules	2009-06-04 21:13:44 UTC (rev 8717)
+++ packages/py-sendfile/trunk/debian/rules	2009-06-04 22:07:21 UTC (rev 8718)
@@ -35,13 +35,15 @@
 install-python%: build
 	python$* setup.py install \
 		--skip-build --single-version-externally-managed \
-		--root $(PKGDIR)
+		--root $(PKGDIR) \
+		--install-layout=deb
 	touch $@
 
 install-debug-python%: build
 	python$*-dbg setup.py install \
 		--skip-build --single-version-externally-managed \
-		--root $(PKGDIR)-dbg/
+		--root $(PKGDIR)-dbg/ \
+		--install-layout=deb
 	find $(PKGDIR)-dbg/usr/lib/python$*/ ! -type d ! -name '*_d\.so' \
 		-delete
 	find $(PKGDIR)-dbg/usr/lib/python$*/ -depth -empty -delete