Merge /home/luk/wanna-build

diff --git a/bin/wanna-build-statistics b/bin/wanna-build-statistics
index 70a689f3fc835c0613c00288e595fd2472c38376..a7cb158b69a3c5ab375080da2d95e54f9af30e46 100755 (executable)
--- a/bin/wanna-build-statistics
+++ b/bin/wanna-build-statistics
@@ -59,7 +59,7 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) {
                $dist = "stable"   if $dist eq "s";
                $dist = "testing"  if $dist eq "t";
                $dist = "unstable" if $dist eq "u";
-               die "Bad distribution\n" if !isin($dist, qw(stable testing unstable stable-security testing-security));
+               die "Bad distribution\n" if !isin($dist, qw(stable testing unstable stable-security testing-security oldstable oldstable-security));
        }
        elsif (/^--$/) {
                last;

diff --git a/bin/wb-graph b/bin/wb-graph
index 1a65dbc1bc4c8dfa5e1306fae2b25461ec4c08f0..941938031ddc707cc076301af181f0ffaee171ac 100755 (executable)
--- a/bin/wb-graph
+++ b/bin/wb-graph
@@ -19,10 +19,11 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) {
                else {
                        $dist = shift @ARGV;
                }
-               $dist = "stable"   if $dist eq "s";
-               $dist = "frozen"   if $dist eq "f";
-               $dist = "unstable" if $dist eq "u";
-               die "Bad distribution\n" if !isin($dist, qw(stable testing unstable));
+               $dist = "oldstable" if $dist eq "o";
+               $dist = "stable"    if $dist eq "s";
+               $dist = "tesing"    if $dist eq "t";
+               $dist = "unstable"  if $dist eq "u";
+               die "Bad distribution\n" if !isin($dist, qw(oldstable stable testing unstable));
        }
        elsif (/^--$/) {
                last;

diff --git a/etc/wanna-build.conf.local b/etc/wanna-build.conf.local
index febf5ecc51dc47c97b996674e4f90fdbf46473b9..ab66c05d73ee430dc94597e996897a94b3c86e6f 100644 (file)
--- a/etc/wanna-build.conf.local
+++ b/etc/wanna-build.conf.local
@@ -16,7 +16,7 @@ $db_maint = "wb-team\@buildd.debian.org";
 
 # mail address of not-for-us maintainer (informed about Not-For-Us state
 # changes)
-$notforus_maint = "rmurray-wanna-build";
+$notforus_maint = "notforus\@buildd.debian.org";
 
 # mail address for logs of all state changes
 #$log_mail = "m68k-changes\@nocrew.org";

diff --git a/postrelease b/postrelease
index f40522988e2fd1e7d61e33d538ff8d5c33852417..1afda22e1932d244f064d391158b2b170d30c059 100644 (file)
--- a/postrelease
+++ b/postrelease
@@ -3,8 +3,8 @@
 
 set -e
 
-# etch
-ARCHS_stable="arm sparc alpha powerpc i386 mips mipsel ia64 hppa s390"
+# lenny
+ARCHS_stable="arm sparc alpha powerpc i386 amd64 mips mipsel ia64 hppa s390"
 ARCHS_testing="arm sparc alpha powerpc i386 amd64 mips mipsel ia64 hppa s390 armel"
 
 #for a in $ALL_ARCHS; do
@@ -36,6 +36,9 @@ for a in $ARCHS_testing; do
     if [ "$a" = "amd64" ]; then
         group=wb-i386
     fi
+    if [ "$a" = "armel" ]; then
+        group=wb-arm
+    fi
     chgrp $group $a/build-db-testing*
     chmod 000 $a/build-db-testing
     chmod 000 $a/build-db-testing-security