From: Brian Warner <warner@lothar.com>
Date: Thu, 18 Jun 2009 05:05:02 +0000 (-0700)
Subject: Makefile: add jaunty support, rearrange debian sections in order of release
X-Git-Tag: trac-4000~82
X-Git-Url: https://git.rkrishnan.org/$sch_link?a=commitdiff_plain;h=2100aef6551a94d8e80b4e15f41bde4d33444c13;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: add jaunty support, rearrange debian sections in order of release
---

diff --git a/Makefile b/Makefile
index 1cc40fcf..6f5ead9f 100644
--- a/Makefile
+++ b/Makefile
@@ -292,19 +292,22 @@ show-pp:
 	@echo $(PP)
 
 .PHONY: setup-deb deb-ARCH is-known-debian-arch
-.PHONY: deb-etch deb-sid
-.PHONY: deb-edgy deb-feisty deb-gutsy deb-hardy deb-intrepid deb-lenny
+.PHONY: deb-etch deb-lenny deb-sid
+.PHONY: deb-edgy deb-feisty deb-gutsy deb-hardy deb-intrepid deb-jaunty
 
+# etch uses the feisty control files for now
+deb-etch:
+	$(MAKE) deb-ARCH ARCH=etch TAHOE_ARCH=feisty
+deb-lenny:
+	$(MAKE) deb-ARCH ARCH=lenny TAHOE_ARCH=feisty
 deb-sid:
 	$(MAKE) deb-ARCH ARCH=sid
-deb-feisty:
-	$(MAKE) deb-ARCH ARCH=feisty
+
 # edgy uses the feisty control files for now
 deb-edgy:
 	$(MAKE) deb-ARCH ARCH=edgy TAHOE_ARCH=feisty
-# etch uses the feisty control files for now
-deb-etch:
-	$(MAKE) deb-ARCH ARCH=etch TAHOE_ARCH=feisty
+deb-feisty:
+	$(MAKE) deb-ARCH ARCH=feisty
 # same with gutsy, the process has been nicely stable for a while now
 deb-gutsy:
 	$(MAKE) deb-ARCH ARCH=gutsy TAHOE_ARCH=feisty
@@ -312,13 +315,13 @@ deb-hardy:
 	$(MAKE) deb-ARCH ARCH=hardy TAHOE_ARCH=feisty
 deb-intrepid:
 	$(MAKE) deb-ARCH ARCH=intrepid TAHOE_ARCH=feisty
-deb-lenny:
-	$(MAKE) deb-ARCH ARCH=lenny TAHOE_ARCH=feisty
+deb-jaunty:
+	$(MAKE) deb-ARCH ARCH=jaunty TAHOE_ARCH=feisty
 
 
 
 # we know how to handle the following debian architectures
-KNOWN_DEBIAN_ARCHES := etch sid  edgy feisty gutsy hardy intrepid lenny
+KNOWN_DEBIAN_ARCHES := etch lenny sid  edgy feisty gutsy hardy intrepid jaunty
 
 ifeq ($(findstring x-$(ARCH)-x,$(foreach arch,$(KNOWN_DEBIAN_ARCHES),"x-$(arch)-x")),)
 is-known-debian-arch:
@@ -354,18 +357,27 @@ deb-ARCH: is-known-debian-arch setup-deb
 	@echo "The newly built .deb packages are in the parent directory from here."
 
 .PHONY: increment-deb-version
-.PHONY: deb-edgy-head deb-feisty-head deb-gutsy-head deb-hardy-head deb-intrepid-head deb-lenny-head
-.PHONY: deb-etch-head deb-sid-head
+.PHONY: deb-etch-head deb-lenny-head deb-sid-head
+.PHONY: deb-edgy-head deb-feisty-head deb-gutsy-head deb-hardy-head deb-intrepid-head deb-jaunty-head
 
 # The buildbot runs the following targets after each change, to produce
 # up-to-date tahoe .debs. These steps do not create .debs for anything else.
 
 increment-deb-version: make-version
 	debchange --newversion $(VER) $(DEBCOMMENTS)
+deb-etch-head:
+	$(MAKE) setup-deb ARCH=etch TAHOE_ARCH=feisty
+	$(MAKE) increment-deb-version
+	fakeroot debian/rules binary
+deb-lenny-head:
+	$(MAKE) setup-deb ARCH=lenny TAHOE_ARCH=feisty
+	$(MAKE) increment-deb-version
+	fakeroot debian/rules binary
 deb-sid-head:
 	$(MAKE) setup-deb ARCH=sid
 	$(MAKE) increment-deb-version
 	fakeroot debian/rules binary
+
 deb-edgy-head:
 	$(MAKE) setup-deb ARCH=edgy TAHOE_ARCH=feisty
 	$(MAKE) increment-deb-version
@@ -374,10 +386,6 @@ deb-feisty-head:
 	$(MAKE) setup-deb ARCH=feisty
 	$(MAKE) increment-deb-version
 	fakeroot debian/rules binary
-deb-etch-head:
-	$(MAKE) setup-deb ARCH=etch TAHOE_ARCH=feisty
-	$(MAKE) increment-deb-version
-	fakeroot debian/rules binary
 deb-gutsy-head:
 	$(MAKE) setup-deb ARCH=gutsy TAHOE_ARCH=feisty
 	$(MAKE) increment-deb-version
@@ -390,8 +398,8 @@ deb-intrepid-head:
 	$(MAKE) setup-deb ARCH=intrepid TAHOE_ARCH=feisty
 	$(MAKE) increment-deb-version
 	fakeroot debian/rules binary
-deb-lenny-head:
-	$(MAKE) setup-deb ARCH=lenny TAHOE_ARCH=feisty
+deb-jaunty-head:
+	$(MAKE) setup-deb ARCH=jaunty TAHOE_ARCH=feisty
 	$(MAKE) increment-deb-version
 	fakeroot debian/rules binary