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

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

    Date: Thursday, June 4, 2009 @ 23:24:38
  Author: gilir-guest
Revision: 8727

Merge Ubuntu changes for Python 2.6 transition

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

Modified: packages/pyxine/trunk/debian/changelog
===================================================================
--- packages/pyxine/trunk/debian/changelog	2009-06-04 23:19:04 UTC (rev 8726)
+++ packages/pyxine/trunk/debian/changelog	2009-06-04 23:24:38 UTC (rev 8727)
@@ -10,8 +10,16 @@
   [ Piotr Ożarowski ]
   * Fix debian/watch to handle alpha versions correctly
 
- -- Sandro Tosi <morph at debian.org>  Wed, 22 Oct 2008 11:39:58 +0200
+  [ 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-dev (>= 2.5.4-1~)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 22:43:15 +0200
+
 pyxine (0.1alpha2-5) unstable; urgency=low
 
   * debian/control

Modified: packages/pyxine/trunk/debian/control
===================================================================
--- packages/pyxine/trunk/debian/control	2009-06-04 23:19:04 UTC (rev 8726)
+++ packages/pyxine/trunk/debian/control	2009-06-04 23:24:38 UTC (rev 8727)
@@ -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.0.38), libxext-dev, libxine-dev, python-all-dev (>= 2.3.5-11), python-all-dbg, python-support (>= 0.6.4), dpatch
+Build-Depends: debhelper (>= 5.0.38), libxext-dev, libxine-dev, python-all-dev (>= 2.5.4-1~), python-all-dbg, python-support (>= 0.6.4), dpatch
 XS-Python-Version: all
 Standards-Version: 3.7.3
 Homepage: http://pyxine.sourceforge.net/

Modified: packages/pyxine/trunk/debian/rules
===================================================================
--- packages/pyxine/trunk/debian/rules	2009-06-04 23:19:04 UTC (rev 8726)
+++ packages/pyxine/trunk/debian/rules	2009-06-04 23:24:38 UTC (rev 8727)
@@ -3,6 +3,7 @@
 # Ed Boraas.
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
 PYVERS=$(shell pyversions -r)
 
@@ -42,8 +43,13 @@
 	dh_installdirs
 
 	for python in ${PYVERS} ; do \
- 	    $$python setup.py install --no-compile --root=$(CURDIR)/debian/python-pyxine ; \
- 	    $$python-dbg setup.py install --no-compile --root=$(CURDIR)/debian/python-pyxine-dbg ; \
+ 	    $$python setup.py install --no-compile \
+			--root=$(CURDIR)/debian/python-pyxine \
+			$(py_setup_install_args); \
+
+ 	    $$python-dbg setup.py install --no-compile \
+			--root=$(CURDIR)/debian/python-pyxine-dbg \
+			$(py_setup_install_args); \
 	done
 
 	# remove things not needed in a debug package