r1724 - in zope.testbrowser/trunk/debian (changelog control rules)

[Fabio Tranchitella]

    Date: Friday, August 28, 2009 @ 09:36:51
  Author: kobold
Revision: 1724

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

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

Modified: zope.testbrowser/trunk/debian/changelog
===================================================================
--- zope.testbrowser/trunk/debian/changelog	2009-08-28 09:34:24 UTC (rev 1723)
+++ zope.testbrowser/trunk/debian/changelog	2009-08-28 09:36:51 UTC (rev 1724)
@@ -1,3 +1,11 @@
+zope.testbrowser (3.5.1-2) unstable; urgency=low
+
+  * Standards-Version: 3.8.3, no changed required.
+  * debian/rules: fixed FTBFS with Python 2.6. (Closes: #543229)
+  * debian/control: added conflict with zope3.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 28 Aug 2009 11:35:44 +0200
+
 zope.testbrowser (3.5.1-1) unstable; urgency=low
 
   * Convert to use python-van.pydeb for dependency management.

Modified: zope.testbrowser/trunk/debian/control
===================================================================
--- zope.testbrowser/trunk/debian/control	2009-08-28 09:34:24 UTC (rev 1723)
+++ zope.testbrowser/trunk/debian/control	2009-08-28 09:36:51 UTC (rev 1724)
@@ -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.testbrowser/trunk
 
@@ -13,6 +13,7 @@
 Depends: ${setuptools:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Suggests: ${setuptools:Suggests}
+Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: programmable browser for functional black-box tests
  Provides an easy-to-use programmable web browser with special focus on

Modified: zope.testbrowser/trunk/debian/rules
===================================================================
--- zope.testbrowser/trunk/debian/rules	2009-08-28 09:34:24 UTC (rev 1723)
+++ zope.testbrowser/trunk/debian/rules	2009-08-28 09:36:51 UTC (rev 1724)
@@ -3,7 +3,7 @@
 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 test) >> 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 test) >> debian/$(package).substvars
+	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra test) >> debian/$(package).substvars
+	(echo -n 'setuptools:Provides=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra test) >> 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 test) >> debian/$(package).substvars
+	(echo -n 'setuptools:Suggests=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra test) >> debian/$(package).substvars