New globals ORIGIN and LABEL. Flip listing order of globals DISTS and ARCHS

1 files changed, 23 insertions, 3 deletions

diff --git a/localdebpool b/localdebpool
index 5ccd24e..3a38fd1 100755
--- a/localdebpool
+++ b/localdebpool
@@ -3,8 +3,10 @@
 set -e
 #set -x
 
-ARCHS="i386 powerpc amd64"
+ORIGIN="Jones"
+LABEL="Jones"
 DISTS="etch lenny sid"
+ARCHS="i386 powerpc amd64"
 
 SRCBASE=~/public_debian
 PUBBASE=~/public_websites/debian.jones.dk
@@ -81,8 +83,8 @@ genlist() {
 	cat <<EOF > "$destdir/Release"
 Archive: $dist
 Component: $section
-Origin: Jones
-Label: Jones
+Origin: $ORIGIN
+Label: $LABEL
 Architecture: $arch
 EOF
 }
@@ -112,19 +114,37 @@ genlistsfromsection() {
 			fi
 		done
 		[ -n "$do_dist" ] || continue
+		archlist=
 		for arch in $ARCHS; do
 			do_arch=
 			for arch_found in $archs; do
 				case $arch_found in
 				    $arch|all)
 					do_arch=1
+					archlist="$archlist $arch"
 					continue
+					;;
 				esac
 			done
 			[ -n "$do_arch" ] || continue
 			genlist "$dist" "$arch" "$srcdir" "$PUBBASE/dists/$dist/$section"
 		done
 		genlist "$dist" "source" "$srcdir" "$PUBBASE/dists/$dist/$section"
+		case "$dist" in
+		    etch) suite="stable";;
+		    lenny) suite="testing";;
+		    sid) suite="unstable";;
+		esac
+# TODO: Enable the below when running magic section "all"
+# (needs all sections fed in here instead of each single section)
+#		cat <<EOF > "$PUBBASE/dists/$dist/Release"
+#Origin: $ORIGIN
+#Label: $LABEL
+#Suite: $suite
+#Codename: $dist
+#Architectures:$archlist
+#Components: $sections
+#EOF
 	done
 }