[Python-modules-commits] r8724 - in packages/parallelpython/trunk/debian (3 files)

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

    Date: Thursday, June 4, 2009 @ 23:10:23
  Author: gilir-guest
Revision: 8724

Merge Ubuntu changes for Python 2.6 transition

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

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2009-06-04 23:07:59 UTC (rev 8723)
+++ packages/parallelpython/trunk/debian/changelog	2009-06-04 23:10:23 UTC (rev 8724)
@@ -1,5 +1,6 @@
 parallelpython (1.5.7-1) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * New upstream release
   * debian/rules
     - updated manpage location
@@ -9,8 +10,17 @@
   * debian/patches/10_remove_default_password.dpatch
     - adapted to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Tue, 03 Mar 2009 22:18:33 +0100
+  [ Julien Lavergne ]
+  * From Ubuntu, prepare for the future python transition:
+    - debian/rules: 
+     + Include /usr/share/python/python.mk
+     + Add $(py_setup_install_args) to setup.py install
+    - debian/control: 
+     + Bump build-depends to python-all (>= 2.5.4-1~)
+     + Bump build-depends to debhelper (>= 5.0.38)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 18:17:49 +0200
+
 parallelpython (1.5.6-2) unstable; urgency=low
 
   * Uploading to unstable, since Lenny has been released

Modified: packages/parallelpython/trunk/debian/control
===================================================================
--- packages/parallelpython/trunk/debian/control	2009-06-04 23:07:59 UTC (rev 8723)
+++ packages/parallelpython/trunk/debian/control	2009-06-04 23:10:23 UTC (rev 8724)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5), 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://www.parallelpython.com/
 Standards-Version: 3.8.0

Modified: packages/parallelpython/trunk/debian/rules
===================================================================
--- packages/parallelpython/trunk/debian/rules	2009-06-04 23:07:59 UTC (rev 8723)
+++ packages/parallelpython/trunk/debian/rules	2009-06-04 23:10:23 UTC (rev 8724)
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
 build: patch
 	dh_testdir
@@ -31,7 +32,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/python-pp.
-	python setup.py install --root=$(CURDIR)/debian/python-pp
+	python setup.py install --root=$(CURDIR)/debian/python-pp $(py_setup_install_args)
 
 	# Policy 10.4 - removing extension
 	mv $(CURDIR)/debian/python-pp/usr/bin/ppserver.py $(CURDIR)/debian/python-pp/usr/bin/ppserver