debian: depend upon python-zfec, stop including zfec in the tahoe .deb

diff --git a/misc/feisty/debian/control b/misc/feisty/debian/control
index d5f2e43524e6ddabb9012b477dca48d4cb507e4f..3b39fdf7c31144c72d0c2790305962df6bb5282b 100644 (file)
--- a/misc/feisty/debian/control
+++ b/misc/feisty/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted, python-foolscap, python-pyopenssl, python-nevow, python-simplejson
+Depends: ${python:Depends}, python-twisted, python-foolscap, python-pyopenssl, python-nevow, python-simplejson, python-zfec
 Recommends:
 XB-Python-Version: 2.4,2.5
 Description: A secure distributed filestore

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
index cf1dddd3eac2200ccbbba4e761a957b26212e3a6..5abfddcb03469126804e1cfc4f035277931beb77 100644 (file)
--- a/misc/feisty/debian/rules
+++ b/misc/feisty/debian/rules
@@ -11,7 +11,6 @@ STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
 install/allmydata-tahoe::
        mkdir -pm755 $(STAGING_DIR)
-       cd src/zfec && python setup.py install --single-version-externally-managed --root=$(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
 
        dh_pycentral

diff --git a/misc/sid/debian/control b/misc/sid/debian/control
index d48cf0c5de29bc82ed16c759c08be57e03b6acde..02a8ecc04f7e4f71e9b141f7f7dd7b81bd4640c1 100644 (file)
--- a/misc/sid/debian/control
+++ b/misc/sid/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted-core, python-foolscap, python-pyopenssl, python-twisted-names, python-nevow, python-simplejson
+Depends: ${python:Depends}, python-twisted-core, python-foolscap, python-pyopenssl, python-twisted-names, python-nevow, python-simplejson, python-zfec
 Recommends:
 XB-Python-Version: 2.4
 Description: A secure distributed filestore

diff --git a/misc/sid/debian/rules b/misc/sid/debian/rules
index 0cac8bf7b4b6ddf3d3ba8873226f93ff9475a8a8..546adfa3103ecf105f2b31c6e9132cdf069f39af 100644 (file)
--- a/misc/sid/debian/rules
+++ b/misc/sid/debian/rules
@@ -10,7 +10,6 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 PREFIX=$(shell pwd)/debian/allmydata-tahoe/usr
 
 build/allmydata-tahoe::
-       cd src/zfec && python2.4 setup.py install --single-version-externally-managed --root=$(PREFIX)/..
        python2.4 setup.py install --prefix=$(PREFIX)
 
 clean::