Bug#543232: zope.component: FTBFS with python 2.6

[Michael Bienia]

Package: zope.component
Version: 3.7.0-1
Severity: wishlist
Tags: patch

Hello,

here is a patch (based on the same changes to zope.interface) to let
zope.component build with python2.6.

Michael
-------------- next part --------------
diff -u zope.component-3.7.0/debian/changelog zope.component-3.7.0/debian/changelog
--- zope.component-3.7.0/debian/changelog
+++ zope.component-3.7.0/debian/changelog
@@ -1,3 +1,10 @@
+zope.component (3.7.0-2) unstable; urgency=low
+
+  * debian/rules:
+    Determine the correct library path for python 2.5 and python 2.6. 
+
+ -- Michael Bienia <geser at ubuntu.com>  Mon, 20 Jul 2009 16:22:32 +0200
+
 zope.component (3.7.0-1) unstable; urgency=low
 
   * New upstream release
diff -u zope.component-3.7.0/debian/rules zope.component-3.7.0/debian/rules
--- zope.component-3.7.0/debian/rules
+++ zope.component-3.7.0/debian/rules
@@ -6,8 +6,8 @@
-	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/usr/lib/python$*/site-packages/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
-	(echo -n 'setuptools:Provides=' && van-pydeb depends --egg-info debian/$(package)/usr/lib/python$*/site-packages/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
+	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
+	(echo -n 'setuptools:Provides=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
 	# the hook extra is an optimization, to Recommends
-	(echo -n 'setuptools:Recommends=' && van-pydeb depends --egg-info debian/$(package)/usr/lib/python$*/site-packages/$(py_package).egg-info --extra hook) >> debian/$(package).substvars
+	(echo -n 'setuptools:Recommends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra hook) >> debian/$(package).substvars
 	# docs and test to suggests
-	(echo -n 'setuptools:Suggests=' && van-pydeb depends --egg-info debian/$(package)/usr/lib/python$*/site-packages/$(py_package).egg-info --extra docs --extra test) >> debian/$(package).substvars
+	(echo -n 'setuptools:Suggests=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra docs --extra test) >> debian/$(package).substvars
 	# -zcml metapackage dependencies
-	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/usr/lib/python$*/site-packages/$(py_package).egg-info --extra zcml) >> debian/$(package)-zcml.substvars
+	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra zcml) >> debian/$(package)-zcml.substvars