debian: we now require setuptools at build time, and that or pkg_resources at runtime

diff --git a/misc/feisty/debian/control b/misc/feisty/debian/control
index 845aff4ea20b40e5d0e33746f705794cc9c39ba5..8e779e32eb1217f321f7eaa7d66586fb764415fd 100644 (file)
--- a/misc/feisty/debian/control
+++ b/misc/feisty/debian/control
@@ -2,14 +2,14 @@ Source: allmydata-tahoe
 Section: python
 Priority: optional
 Maintainer: Brian Warner <warner@allmydata.com>
-Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-central (>= 0.4.10), python, python-all-dev
+Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-central (>= 0.4.10), python-setuptools, python, python-all-dev
 Build-Depends-Indep: python-twisted
 XS-Python-Version: 2.4,2.5
 Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.2.5), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8)
+Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.2.5), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8), python-pkg-resources | python-setuptools
 Recommends:
 XB-Python-Version: 2.4,2.5
 Description: A secure distributed filestore

diff --git a/misc/sid/debian/control b/misc/sid/debian/control
index fa68d9947416d701fc85c03297aa71a1b9470340..cca142c8d582b66a6d426cfd4e9e97328d07c541 100644 (file)
--- a/misc/sid/debian/control
+++ b/misc/sid/debian/control
@@ -2,14 +2,14 @@ Source: allmydata-tahoe
 Section: python
 Priority: optional
 Maintainer: Brian Warner <warner@allmydata.com>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-central (>= 0.5), python, python-dev
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-central (>= 0.5), python-setuptools, python, python-dev
 Build-Depends-Indep: python-twisted-core
 XS-Python-Version: 2.4
 Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted-core, python-foolscap (>= 0.2.5), python-pyopenssl, python-twisted-names, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8)
+Depends: ${python:Depends}, python-twisted-core, python-foolscap (>= 0.2.5), python-pyopenssl, python-twisted-names, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8), python-pkg-resources | python-setuptools
 Recommends:
 XB-Python-Version: 2.4
 Description: A secure distributed filestore