[Python-modules-team] Bug#523065: Please make pycg ready for Python 2.6.

[Alessio Treglia]

Package: pycg
Version: 0.14.1-1
Severity: important
Tags: patch

Some changes are needed to build pycg with Python 2.6.

I'm attaching ubuntu's debdiff which solve this.

-- System Information:
Debian Release: lenny/sid
  APT prefers intrepid-updates
  APT policy: (500, 'intrepid-updates'), (500, 'intrepid-security'), (500, 'intrepid-backports'), (500, 'intrepid')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.27-11-generic (SMP w/1 CPU core)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
diff -u pycg-0.14.1/debian/control pycg-0.14.1/debian/control
--- pycg-0.14.1/debian/control
+++ pycg-0.14.1/debian/control
@@ -1,7 +1,8 @@
 Source: pycg
 Section: contrib/python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <matrixhasu at gmail.com>
 Build-Depends: debhelper (>= 5), python-central (>= 0.6), python, dpatch, python-all-dev, swig, nvidia-cg-toolkit, python-numpy, mesa-common-dev, libgl1-mesa-dev, python-numpy-dbg
 Standards-Version: 3.7.3
diff -u pycg-0.14.1/debian/changelog pycg-0.14.1/debian/changelog
--- pycg-0.14.1/debian/changelog
+++ pycg-0.14.1/debian/changelog
@@ -1,3 +1,13 @@
+pycg (0.14.1-1ubuntu1) jaunty; urgency=low
+
+  * Python 2.6 transition:
+    - debian/rules:
+      + Include /usr/share/python/python.mk.
+      + Use $(call py_sitename, $*) and $(py_setup_install_args) macros to
+        install all the python stuffs correctly.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 08 Apr 2009 10:25:57 +0200
+
 pycg (0.14.1-1) unstable; urgency=low
 
   * Initial release (Closes: #446791)
diff -u pycg-0.14.1/debian/rules pycg-0.14.1/debian/rules
--- pycg-0.14.1/debian/rules
+++ pycg-0.14.1/debian/rules
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
 include /usr/share/dpatch/dpatch.make
 
 PYVERS=$(shell pyversions -vr)
@@ -23,11 +24,11 @@
 build-python%:
 	dh_testdir
 	[ ! -d build ] || rm -rf build
-	mkdir -p debian/python-cg/usr/lib/python$*/site-packages/
+	mkdir -p debian/python-cg/usr/lib/python$*/$(call py_sitename, $*)/
 
 	$(MAKE) PYTHON_I=python$* PYTHON=python$* clean
 	$(MAKE) PYTHON_I=python$* PYTHON=python$*
-	dh_install _Cg.so /usr/lib/python$*/site-packages/
+	dh_install _Cg.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
@@ -53,7 +54,7 @@
 	mkdir Cg
 	cp Cg.py Cg/__init__.py
 
-	python setup.py install --root=$(CURDIR)/debian/python-cg
+	python setup.py install --root=$(CURDIR)/debian/python-cg $(py_setup_install_args)
 
 # Build architecture-independent files here.
 binary-indep: