[Python-modules-commits] r8720 - in packages/python-pyglew/trunk/debian (3 files)

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

    Date: Thursday, June 4, 2009 @ 22:21:49
  Author: gilir-guest
Revision: 8720

Merge Ubuntu changes for Python 2.6 transition

Modified:
  packages/python-pyglew/trunk/debian/changelog
  packages/python-pyglew/trunk/debian/control
  packages/python-pyglew/trunk/debian/rules

Modified: packages/python-pyglew/trunk/debian/changelog
===================================================================
--- packages/python-pyglew/trunk/debian/changelog	2009-06-04 22:14:46 UTC (rev 8719)
+++ packages/python-pyglew/trunk/debian/changelog	2009-06-04 22:21:49 UTC (rev 8720)
@@ -1,3 +1,19 @@
+python-pyglew (0.1.2-4) UNRELEASED; urgency=low
+
+  * From Ubuntu, prepare for the future python transition,
+    thanks Alessio Treglia for the patch (Closes: #521679):
+   - debian/rules : 
+    + Include /usr/share/python/python.mk
+    + Append $(py_setup_install_args) macro to setup.py options to install
+      all python stuffs in the right places.
+    + Use $(call py_sitename, $*) macro to install the modules into the
+      appropriate path (/usr/share/python*/*-packages).
+   - debian/control :
+    + Build-depends on python and python-all-dev (>= 2.5.4-1~)
+    + Build-depends on debhelper (>= 5.0.38)
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 01:38:34 +0200
+
 python-pyglew (0.1.2-3) unstable; urgency=low
 
   * debian/control

Modified: packages/python-pyglew/trunk/debian/control
===================================================================
--- packages/python-pyglew/trunk/debian/control	2009-06-04 22:14:46 UTC (rev 8719)
+++ packages/python-pyglew/trunk/debian/control	2009-06-04 22:21:49 UTC (rev 8720)
@@ -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), libglew-dev, python-central (>= 0.5.6), python, dpatch, python-all-dev
+Build-Depends: debhelper (>= 5.0.38), libglew-dev, python-central (>= 0.5.6), python (>= 2.5.4-1~), dpatch, python-all-dev (>= 2.5.4-1~)
 Standards-Version: 3.8.0
 Homepage: http://www.cs.lth.se/home/Calle_Lejdfors/pygpu/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pyglew/trunk/

Modified: packages/python-pyglew/trunk/debian/rules
===================================================================
--- packages/python-pyglew/trunk/debian/rules	2009-06-04 22:14:46 UTC (rev 8719)
+++ packages/python-pyglew/trunk/debian/rules	2009-06-04 22:21:49 UTC (rev 8720)
@@ -3,6 +3,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/python/python.mk
 
 PYVERS=$(shell pyversions -vr)
 
@@ -23,10 +24,10 @@
 build-ext-%:
 	dh_testdir
 	[ ! -d build ] || rm -rf build
-	mkdir -p debian/python-pyglew/usr/lib/python$*/site-packages/
+	mkdir -p debian/python-pyglew/usr/lib/python$*/$(call py_sitename, $*)
 	
 	$(MAKE) PYTHON=python$*
-	dh_install build/pyglew.so /usr/lib/python$*/site-packages/
+	dh_install build/pyglew.so /usr/lib/python$*/$(call py_sitename, $*)
 	
 	# workaround to let think libpython<VER> is local, so that dh_shlibdebs does not generate
 	# dependencies on them, but only ${python:Depends} will
@@ -42,7 +43,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-	python setup.py install --root=$(CURDIR)/debian/python-pyglew
+	python setup.py install --root=$(CURDIR)/debian/python-pyglew $(py_setup_install_args)
 
 # Build architecture-independent files here.
 binary-indep: build install