Merge from mainline.

diff --git a/bugcounts b/bugcounts
index b53527ebcd2dd805355675e245bb4fcae2093416..1a84994c803d2a8899a17db99e833af474131e70 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -49,7 +49,7 @@ for my $bug (values %scanlib::bugs) {
        $total++;
        $pendingcount++ if ($bug->{'pending'});
        $patchcount++ if ($bug->{'patch'});
-       $ignorecount++ if ($bug->{'sarge-ignore'} || $bug->{'etch-ignore'});
+       $ignorecount++ if ($bug->{'etch-ignore'} || $bug->{'lenny-ignore'});
        $worrycount++ if (scanlib::check_worry($bug));
        $stablecount++ if (scanlib::check_worry_stable($bug));
 }

diff --git a/bugreport b/bugreport
index 3b128fda610d5c6ed8cc8f6ceb9a4ebdec2d75d8..79c325f27c223a0c61a3d4073a5ae65815922de3 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }
-                               print "<strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+                               print "<strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
                                printf "<A NAME=\"$nr\"></A>  %s [%s] [%s] %s\n", scanlib::wwwnumber($nr),
@@ -111,7 +111,7 @@ sub MakeBuglist() {
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), 
                                        scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
                                print "</em>" if $worry;
-                               print "</strike>" if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+                               print "</strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
                        } else {
                                printf("  %-6d [%s] [%s] %s\n", $nr, scanlib::get_taginfo($scanlib::bugs{$nr}),
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), $scanlib::bugs{$nr}->{'subject'});
@@ -142,7 +142,7 @@ sub MakeStatistics() {
                for my $nr (@{$scanlib::packagelist{$p}}) {
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});
-                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'sarge-ignore'} || $scanlib::bugs{$nr}->{'etch-ignore'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 

diff --git a/crontab b/crontab
index 06e93cce4f5d68fce112bd91de6ef056a3ade342..40b9b592a18aa0eaa4242343f81bbe64f0f40d55 100755 (executable)
--- a/crontab
+++ b/crontab
@@ -2,7 +2,7 @@
 
 set -e
 
-cd /home/sesse/bugscan
+cd /org/bugs.debian.org/bugscan
 
 # Run script from doogie to check packages in Incoming
 # ../../doogie/chgscan/update -o quiet=yes
@@ -30,6 +30,3 @@ ln -sf $countfile count
 ./dohtml
 ./dostatus
 ./dograph
-
-rsync -r www/ sesse@gluck.debian.org:public_html/bugscan/
-

diff --git a/dograph b/dograph
index a005901e4e4c3463251caab58397354310cddd37..00be2d3b33d74f90c8fcc54f94ce4bc48b6d1a3b 100755 (executable)
--- a/dograph
+++ b/dograph
@@ -2,7 +2,7 @@
 
 set -e
 
-cd /home/sesse/bugscan
+cd /org/bugs.debian.org/bugscan
 
 tmp=`tempfile`
 tmp2=`tempfile`
@@ -31,9 +31,9 @@ set terminal png
 set yrange [0:]
 #set xtics 2678400
 #set nomxtics
-set output "/home/sesse/bugscan/www/graph.png"
+set output "/org/bugs.debian.org/www/bugscan/graph.png"
 plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
 quit
 EOF
 
-rm "$tmp" "$tmp2"
+rm "$tmp" "$tmp2" "$tmp3"

diff --git a/dohtml b/dohtml
index c86d56a452776e9a752fe8afdc245ee9bfd8437b..ebdd71649b062ac4f6ab122eacb522b5706b4988 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-htmldir=/home/sesse/bugscan/www
+htmldir=/org/bugs.debian.org/www/bugscan
 
 realmakepage() {
        local   filter="$1"     # Distributions to list
@@ -51,12 +51,12 @@ tags</a>:
    <li><strong>R</strong>: unreproducible</li>
    <li><strong>S</strong>: security</li>
    <li><strong>U</strong>: upstream</li>
-   <li><strong>I</strong>: sarge-ignore or etch-ignore</li>
+   <li><strong>I</strong>: etch-ignore or lenny-ignore</li>
 </ul>
 
 <p>
 The second set of tags indicate what releases a bug applies to:
-O for oldstable (woody), S for stable (sarge), T for testing (etch),
+O for oldstable (sarge), S for stable (etch), T for testing (lenny),
 U for unstable (sid) or E for experimental.
 
 <p>

diff --git a/dostatus b/dostatus
index 563e2b5455cdad9bad2d7460d76cf76592e8f04c..ad27f67b2aeb9a3830c483a841b30f9b79f4bbcf 100755 (executable)
--- a/dostatus
+++ b/dostatus
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 newtime=`stat --format %y status | cut -d: -f-2`
-echo -n "$newtime (CST): " > /home/sesse/bugscan/www/status
-./bugreport -s >> /home/sesse/bugscan/www/status
+echo -n "$newtime (CST): " > /org/bugs.debian.org/www/bugscan/status
+./bugreport -s >> /org/bugs.debian.org/www/bugscan/status
+
 

diff --git a/makepost b/makepost
index 76b76d097d1aef4e4e23949f13f469a13b9c938f..4d96cf4fe6490e13da46f3a5208663620b100f46 100755 (executable)
--- a/makepost
+++ b/makepost
@@ -23,7 +23,7 @@ Explanation for bug tags:
    I  etch-ignore
 
 The second set of tags indicate what releases a bug applies to:
-O for oldstable (woody), S for stable (sarge), T for testing (etch),
+O for oldstable (sarge), S for stable (etch), T for testing (lenny),
 U for unstable (sid) or E for experimental.
 
 ------------------------------------------------------------------------------

diff --git a/scanlib.pm b/scanlib.pm
index a9b4a04b584276422f6360ac25929a97e619bb25..9bd84581e59d1292a3dfd49662a91e2362ebfa83 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -174,9 +174,9 @@ sub scanspooldir() {
                next if $skip==1;
        
                my %disttags = ();      
-               $disttags{'oldstable'}    = grep(/^woody$/, @tags);
-               $disttags{'stable'}       = grep(/^sarge$/, @tags);
-               $disttags{'testing'}      = grep(/^etch$/, @tags);
+               $disttags{'oldstable'}    = grep(/^sarge$/, @tags);
+               $disttags{'stable'}       = grep(/^etch$/, @tags);
+               $disttags{'testing'}      = grep(/^lenny$/, @tags);
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
@@ -225,7 +225,7 @@ sub scanspooldir() {
                        next if !$affects_any;
                }
 
-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream sarge-ignore etch-ignore) {
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
@@ -317,13 +317,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
-       return ($bi->{'testing'} && !$bi->{'etch-ignore'});
+       return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
-       return ($bi->{'stable'} && !$bi->{'sarge-ignore'});
+       return ($bi->{'stable'} && !$bi->{'etch-ignore'});
 }
 
 sub get_taginfo {
@@ -337,7 +337,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
-       $taginfo .= ($bi->{'sarge-ignore'} || $bi->{'etch-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
 
        return $taginfo;
 }