[Python-modules-commits] r9533 - in packages/psycopg2/trunk/debian (changelog rules)

[bzed at users.alioth.debian.org]

    Date: Thursday, August 27, 2009 @ 16:02:52
  Author: bzed
Revision: 9533

Make the build process compatible to Python2.6.

Modified:
  packages/psycopg2/trunk/debian/changelog
  packages/psycopg2/trunk/debian/rules

Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog	2009-08-27 15:58:05 UTC (rev 9532)
+++ packages/psycopg2/trunk/debian/changelog	2009-08-27 16:02:52 UTC (rev 9533)
@@ -1,10 +1,14 @@
 psycopg2 (2.0.12-1) unstable; urgency=low
 
+  [ Fabio Tranchitella ]
   * New upstream release. (Closes: #536341, #528529)
   * debian/control: bumped Standard-Versions to 3.8.3, no changes required.
 
- -- Fabio Tranchitella <kobold at debian.org>  Thu, 27 Aug 2009 17:51:10 +0200
+  [ Bernd Zeimetz ]
+  * Make the build process compatible to Python2.6.
 
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 27 Aug 2009 18:02:16 +0200
+
 psycopg2 (2.0.9-5) unstable; urgency=low
 
   * debian/control: added dependency on python-egenix-mxdatetime.

Modified: packages/psycopg2/trunk/debian/rules
===================================================================
--- packages/psycopg2/trunk/debian/rules	2009-08-27 15:58:05 UTC (rev 9532)
+++ packages/psycopg2/trunk/debian/rules	2009-08-27 16:02:52 UTC (rev 9533)
@@ -3,6 +3,14 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 PYVERS=$(shell pyversions -r debian/control)
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+  py_setup_install_args =
+endif
 
 configure: configure-stamp
 configure-stamp:
@@ -38,11 +46,11 @@
 	# psycopg2
 	for python in $(PYVERS); do \
             $$python setup.py install \
-		--root=$(CURDIR)/debian/python-psycopg2 --no-compile; \
+		--root=$(CURDIR)/debian/python-psycopg2 --no-compile $(py_setup_install_args); \
 	done
 	for python in $(PYVERS); do \
 	    $$python-dbg setup.py install \
-		--root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile; \
+		--root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile $(py_setup_install_args); \
 	done
 	find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/python-*-dbg -depth -empty -exec rmdir {} \;