switch from lenny to squeeze, and etch to lenny

diff --git a/bugcounts b/bugcounts
index 1a84994c803d2a8899a17db99e833af474131e70..6925f2b8a05fcf8d22ec29a2f52d36d224642cb3 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'});
        $total++;
        $pendingcount++ if ($bug->{'pending'});
        $patchcount++ if ($bug->{'patch'});

-       $ignorecount++ if ($bug->{'etch-ignore'} || $bug->{'lenny-ignore'});
+       $ignorecount++ if ($bug->{'lenny-ignore'} || $bug->{'squeeze-ignore'});

        $worrycount++ if (scanlib::check_worry($bug));
        $stablecount++ if (scanlib::check_worry_stable($bug));
 }
        $worrycount++ if (scanlib::check_worry($bug));
        $stablecount++ if (scanlib::check_worry_stable($bug));
 }

diff --git a/bugreport b/bugreport
index 79c325f27c223a0c61a3d4073a5ae65815922de3..facc662108f9c4497e7394521fba7747dcc11f0b 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -103,7 +103,7 @@ sub MakeBuglist() {
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }
                                } elsif ($scanlib::bugs{$nr}->{'help'}) {
                                        print '<span style="color: #ffaa30">';
                                }

-                               print "<strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+                               print "<strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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),
                                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;
                                        scanlib::get_relinfo($scanlib::bugs{$nr}), 
                                        scanlib::htmlsanit($scanlib::bugs{$nr}->{'subject'});
                                print "</em>" if $worry;

-                               print "</strike>" if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+                               print "</strike>" if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-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'});
                        } 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'});
                for my $nr (@{$scanlib::packagelist{$p}}) {
                        $pendingtotal++ if ($scanlib::bugs{$nr}->{'pending'});
                        $patchtotal++ if ($scanlib::bugs{$nr}->{'patch'});

-                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'etch-ignore'} || $scanlib::bugs{$nr}->{'lenny-ignore'});
+                       $ignoretotal++ if ($scanlib::bugs{$nr}->{'lenny-ignore'} || $scanlib::bugs{$nr}->{'squeeze-ignore'});

                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 
                        $worrytotal++ if (scanlib::check_worry($scanlib::bugs{$nr}));
                        $stabletotal++ if (scanlib::check_worry_stable($scanlib::bugs{$nr}));
 

diff --git a/dohtml b/dohtml
index ebdd71649b062ac4f6ab122eacb522b5706b4988..316d5ee43eda229908648347759395aa66d0cf8b 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -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>R</strong>: unreproducible</li>
    <li><strong>S</strong>: security</li>
    <li><strong>U</strong>: upstream</li>

-   <li><strong>I</strong>: etch-ignore or lenny-ignore</li>
+   <li><strong>I</strong>: lenny-ignore or squeeze-ignore</li>

 </ul>
 
 <p>
 The second set of tags indicate what releases a bug applies to:
 </ul>
 
 <p>
 The second set of tags indicate what releases a bug applies to:

-O for oldstable (sarge), S for stable (etch), T for testing (lenny),
+O for oldstable (sarge), S for stable (lenny), T for testing (squeeze),

 U for unstable (sid) or E for experimental.
 
 <p>
 U for unstable (sid) or E for experimental.
 
 <p>

diff --git a/make-britney-counts b/make-britney-counts
index 9e5c16550a8dbad7c287c3c53d54d9cd316b9cbb..b67d1325e906e9ba416d816488bd727e3bffb585 100755 (executable)
--- a/make-britney-counts
+++ b/make-britney-counts
@@ -48,7 +48,7 @@ while (my ($nr, $bug) = each %scanlib::bugs) {
 
                # this hack is specific to britney counts, and ignores
                # bugs tagged ignore for the next testing release
 
                # this hack is specific to britney counts, and ignores
                # bugs tagged ignore for the next testing release

-               if (scanlib::check_worry_unstable($bug) and not $bug->{'lenny-ignore'}) {
+               if (scanlib::check_worry_unstable($bug) and not $bug->{'squeeze-ignore'}) {

                        push @{$unstablebugs{$package}}, $nr;
                }
                if (scanlib::check_worry($bug)) {
                        push @{$unstablebugs{$package}}, $nr;
                }
                if (scanlib::check_worry($bug)) {

diff --git a/makepost b/makepost
index 4d96cf4fe6490e13da46f3a5208663620b100f46..df952559945dc73c5ea348dbb47fb1a8df34c2ff 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:
    I  etch-ignore
 
 The second set of tags indicate what releases a bug applies to:

-O for oldstable (sarge), S for stable (etch), T for testing (lenny),
+O for oldstable (sarge), S for stable (lenny), T for testing (squeeze),

 U for unstable (sid) or E for experimental.
 
 ------------------------------------------------------------------------------
 U for unstable (sid) or E for experimental.
 
 ------------------------------------------------------------------------------

diff --git a/scanlib.pm b/scanlib.pm
index 7451d88be2826ba6bbebc9b9c662c1325b06f243..65b3d7a6d3211290af4f8c4d318672f946f5f772 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -177,9 +177,9 @@ sub scanspooldir() {
                next if $skip==1;
        
                my %disttags = ();      
                next if $skip==1;
        
                my %disttags = ();      

-               $disttags{'oldstable'}    = grep(/^sarge$/, @tags);
-               $disttags{'stable'}       = grep(/^etch$/, @tags);
-               $disttags{'testing'}      = grep(/^lenny$/, @tags);
+               $disttags{'oldstable'}    = grep(/^etch$/, @tags);
+               $disttags{'stable'}       = grep(/^lenny$/, @tags);
+               $disttags{'testing'}      = grep(/^squeeze$/, @tags);

                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        
                $disttags{'unstable'}     = grep(/^sid$/, @tags);
                $disttags{'experimental'} = grep(/^experimental$/, @tags);
                        


@@ -228,7 +228,7 @@ sub scanspooldir() {
                        next if !$affects_any;
                }
 
                        next if !$affects_any;
                }
 

-               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore) {
+               for my $keyword qw(pending patch help moreinfo unreproducible security upstream etch-ignore lenny-ignore squeeze-ignore) {

                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 
                        $bi->{$keyword} = grep(/^$keyword$/, @tags);
                }
 


@@ -320,13 +320,13 @@ sub wwwname() {
 sub check_worry {
        my ($bi) = @_;
 
 sub check_worry {
        my ($bi) = @_;
 

-       return ($bi->{'testing'} && !$bi->{'lenny-ignore'});
+       return ($bi->{'testing'} && !$bi->{'squeeze-ignore'});

 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 
 }
 
 sub check_worry_stable {
        my ($bi) = @_;
 

-       return ($bi->{'stable'} && !$bi->{'etch-ignore'});
+       return ($bi->{'stable'} && !$bi->{'lenny-ignore'});

 }
 
 sub check_worry_unstable {
 }
 
 sub check_worry_unstable {


@@ -346,7 +346,7 @@ sub get_taginfo {
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";
        $taginfo .= $bi->{'unreproducible'} ? "R" : " ";
        $taginfo .= $bi->{'security'}       ? "S" : " ";
        $taginfo .= $bi->{'upstream'}       ? "U" : " ";

-       $taginfo .= ($bi->{'etch-ignore'} || $bi->{'lenny-ignore'}) ? "I" : " ";
+       $taginfo .= ($bi->{'lenny-ignore'} || $bi->{'squeeze-ignore'}) ? "I" : " ";

 
        return $taginfo;
 }
 
        return $taginfo;
 }