add deb-etch target, rearrange make-version a bit, closes #23

diff --git a/GNUmakefile b/GNUmakefile
index 2b3160ada5e3edcf3feeed38705f6626288eca10..268bae17fb4ef7ef2433d33a2f75406adc075b70 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -54,9 +54,11 @@ show-instdir:
 
 PP=PYTHONPATH=$(PYTHONPATH)
 
-.PHONY: build
-build: build-zfec build-Crypto build-foolscap
+.PHONY: make-version build
+make-version:
        $(PYTHON) misc/make-version.py
+
+build: make-version build-zfec build-Crypto build-foolscap
        $(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin"
 
 build-zfec:
@@ -195,10 +197,11 @@ DEBCOMMENTS="'make deb' build"
 show-version:
        @echo $(VER)
 
-.PHONY: setup-dapper setup-sid setup-edgy setup-feisty
-.PHONY: deb-dapper deb-sid deb-edgy deb-feisty
+.PHONY: setup-dapper setup-sid setup-edgy setup-feisty setup-etch
+.PHONY: deb-dapper deb-sid deb-edgy deb-feisty deb-etch
 .PHONY: increment-deb-version
 .PHONY: deb-dapper-head deb-sid-head deb-edgy-head deb-feisty-head
+.PHONY:  deb-etch-head
 
 setup-dapper:
        rm -f debian
@@ -221,6 +224,12 @@ setup-feisty:
        ln -s feisty/debian debian
        chmod a+x debian/rules
 
+# etch uses the fesity control files for now
+setup-etch:
+       rm -f debian
+       ln -s feisty/debian debian
+       chmod a+x debian/rules
+
 
 deb-dapper: setup-dapper
        fakeroot debian/rules binary && \
@@ -250,7 +259,14 @@ deb-feisty: setup-feisty
        echo && \
        echo "The newly built .deb packages are in the parent directory from here."
 
-increment-deb-version:
+deb-etch: setup-etch
+       fakeroot debian/rules binary && \
+       make -C src/foolscap debian-sid && \
+       mv src/python-foolscap*.deb .. && \
+       echo && \
+       echo "The newly built .deb packages are in the parent directory from here."
+
+increment-deb-version: make-version
        debchange --newversion $(VER) $(DEBCOMMENTS)
 deb-dapper-head: setup-dapper increment-deb-version
        fakeroot debian/rules binary
@@ -260,4 +276,6 @@ deb-edgy-head: setup-edgy increment-deb-version
        fakeroot debian/rules binary
 deb-feisty-head: setup-feisty increment-deb-version
        fakeroot debian/rules binary
+deb-etch-head: setup-etch increment-deb-version
+       fakeroot debian/rules binary