modify debian/rules files to handle zfec+setuptools correctly

diff --git a/dapper/debian/rules b/dapper/debian/rules
index 040f0d7514c26fafbf168eb539ace9be9a96b069..9f74003a2a0d11fd1eb45116c87f8c29e9acb2fa 100644 (file)
--- a/dapper/debian/rules
+++ b/dapper/debian/rules
@@ -33,7 +33,7 @@ install: build
        dh_clean -k
        dh_installdirs
 
-       cd src/zfec && python2.4 setup.py install --prefix=$(PREFIX)
+       cd src/zfec && python2.4 setup.py install --single-version-externally-managed --root=$(PREFIX)/..
        cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX)
        python2.4 setup.py install --prefix=$(PREFIX)
 

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

diff --git a/sid/debian/rules b/sid/debian/rules
index b8d357c2681fb911f85bde330926c42b53bfcc0d..83172017ed33709bd12fcf22497d18ab75377337 100644 (file)
--- a/sid/debian/rules
+++ b/sid/debian/rules
@@ -10,7 +10,7 @@ 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 --prefix=$(PREFIX)
+       cd src/zfec && python2.4 setup.py install --single-version-externally-managed --root=$(PREFIX)/..
        cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX)
        python2.4 setup.py install --prefix=$(PREFIX)