From: Brian Warner <warner@allmydata.com>
Date: Tue, 21 Aug 2007 20:54:51 +0000 (-0700)
Subject: debian: depend upon python-zfec, stop including zfec in the tahoe .deb
X-Git-Tag: allmydata-tahoe-0.6.0~149
X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/nxhtml.html?a=commitdiff_plain;h=4bbc423d70ec81dcf560291cbe6e0ea4f7f2d4b0;p=tahoe-lafs%2Ftahoe-lafs.git

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 d5f2e435..3b39fdf7 100644
--- 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 cf1dddd3..5abfddcb 100644
--- 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 d48cf0c5..02a8ecc0 100644
--- 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 0cac8bf7..546adfa3 100644
--- 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::