rename "pyfec" to "zfec" within tahoe build system and source code

diff --git a/GNUmakefile b/GNUmakefile
index 40d48463a6b3f6c47b29e89fd3a32f41ba572551..486dd21dc1d506cd001a4b0441e987319a37e951 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,17 +44,17 @@ show-instdir:
 PP=PYTHONPATH=$(PYTHONPATH)
 
 .PHONY: build
-build: build-pyfec build-Crypto
+build: build-zfec build-Crypto
        $(PYTHON) setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
 
-build-pyfec:
-       cd src/pyfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
+build-zfec:
+       cd src/zfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
 
-test-pyfec:
-       $(PP) $(PYTHON) src/pyfec/fec/test/test_pyfec.py
+test-zfec:
+       $(PP) $(PYTHON) src/zfec/fec/test/test_zfec.py
 
-clean-pyfec:
-       -cd src/pyfec && python ./setup.py clean ; /bin/rm -rf build
+clean-zfec:
+       -cd src/zfec && python ./setup.py clean ; /bin/rm -rf build
 
 
 build-Crypto:
@@ -124,7 +124,7 @@ count-lines:
 check-memory:
        $(PP) $(PYTHON) src/allmydata/test/check_memory.py
 
-clean: clean-pyfec clean-Crypto
+clean: clean-zfec clean-Crypto
        rm -rf build
        rm -f debian
        rm -rf instdir

diff --git a/README b/README
index 9be2ad993f187e72f23b9813bccdfb1a7760fd3b..0ef5618bf15c37f4f6ba5ec8ecc555c2b86f706e 100644 (file)
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ The main application code is in the 'allmydata' package, under src/allmydata/
 src/Crypto/ which gets installed to the 'allmydata.Crypto' package (since the
 API is different than the normal Crypto package). It also includes Zooko's
 PyFEC library, a fast python wrapper around the Rizzo 'fec' C library,
-installed to the 'pyfec' package and located in src/pyfec/ .
+installed to the 'zfec' package and located in src/zfec/ .
 
 DEPENDENCIES:
 
@@ -57,11 +57,11 @@ INSTALLING:
  can then install.
 
  If not, you'll need to run three separate install steps, one for each of the
- three subpackages (allmydata, allmydata.Crypto, and pyfec). You may wish to
+ three subpackages (allmydata, allmydata.Crypto, and zfec). You may wish to
  use a different version of 'python' for these steps, or provide a --prefix
  or --root argument for the install.
 
-  cd src/pyfec && python setup.py install && cd ../..
+  cd src/zfec && python setup.py install && cd ../..
 
   cd src/Crypto && python setup.py install && cd ../..
 

diff --git a/dapper/debian/rules b/dapper/debian/rules
index 0dde93658bceddf17ff8deecccf8b37ecb68aa7e..040f0d7514c26fafbf168eb539ace9be9a96b069 100644 (file)
--- a/dapper/debian/rules
+++ b/dapper/debian/rules
@@ -33,7 +33,7 @@ install: build
        dh_clean -k
        dh_installdirs
 
-       cd src/pyfec && python2.4 setup.py install --prefix=$(PREFIX)
+       cd src/zfec && python2.4 setup.py install --prefix=$(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 af77fd9ed2702063b59967655ff68cf59ce68193..b68df28faa882e9057dccd85d231446babc3a73c 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/pyfec && python setup.py install --root=$(STAGING_DIR)
+       cd src/zfec && python setup.py install --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 d58a99eb911a0b90ba5d7dae67942de4c20a774b..b8d357c2681fb911f85bde330926c42b53bfcc0d 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/pyfec && python2.4 setup.py install --prefix=$(PREFIX)
+       cd src/zfec && python2.4 setup.py install --prefix=$(PREFIX)
        cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX)
        python2.4 setup.py install --prefix=$(PREFIX)