r1713 - in zope.component/trunk/debian (changelog control rules)

[Fabio Tranchitella]

    Date: Friday, August 28, 2009 @ 09:01:59
  Author: kobold
Revision: 1713

* New upstream release.
* Standards-Version: 3.8.3, no changed required.
* debian/rules: fixed FTBFS with Python 2.6. (Closes: #543232)
* debian/control: added conflict with zope3.

Modified:
  zope.component/trunk/debian/changelog
  zope.component/trunk/debian/control
  zope.component/trunk/debian/rules

Modified: zope.component/trunk/debian/changelog
===================================================================
--- zope.component/trunk/debian/changelog	2009-08-28 08:58:51 UTC (rev 1712)
+++ zope.component/trunk/debian/changelog	2009-08-28 09:01:59 UTC (rev 1713)
@@ -1,3 +1,12 @@
+zope.component (3.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Standards-Version: 3.8.3, no changed required.
+  * debian/rules: fixed FTBFS with Python 2.6. (Closes: #543232)
+  * debian/control: added conflict with zope3.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 28 Aug 2009 11:00:47 +0200
+
 zope.component (3.7.0-1) unstable; urgency=low
 
   * New upstream release

Modified: zope.component/trunk/debian/control
===================================================================
--- zope.component/trunk/debian/control	2009-08-28 08:58:51 UTC (rev 1712)
+++ zope.component/trunk/debian/control	2009-08-28 09:01:59 UTC (rev 1713)
@@ -4,7 +4,7 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.component/trunk
 
@@ -14,6 +14,7 @@
 Recommends: ${setuptools:Recommends}
 Provides: ${setuptools:Provides}
 Suggests: ${python:Provides}, ${setuptools:Suggests}
+Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: Zope Component Architecture
  This package represents the core of the Zope Component Architecture.

Modified: zope.component/trunk/debian/rules
===================================================================
--- zope.component/trunk/debian/rules	2009-08-28 08:58:51 UTC (rev 1712)
+++ zope.component/trunk/debian/rules	2009-08-28 09:01:59 UTC (rev 1713)
@@ -3,11 +3,11 @@
 include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
 
 dependencies-python%:
-	(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