Merge from mainline.

[bugscan.git] / scanlib.pm

diff --git a/scanlib.pm b/scanlib.pm
index 4c768720089f23de08023d1f75a690fae09730c9..9bd84581e59d1292a3dfd49662a91e2362ebfa83 100644 (file)
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -174,14 +174,15 @@ 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);
                        
-               # default according to dondelelcaro 2006-11-11
+               # default according to vorlon 2007-06-17
                if (!$disttags{'oldstable'} && !$disttags{'stable'} && !$disttags{'testing'} && !$disttags{'unstable'} && !$disttags{'experimental'}) {
+                       $disttags{'stable'} = 1;
                        $disttags{'testing'} = 1;
                        $disttags{'unstable'} = 1;
                        $disttags{'experimental'} = 1;