Merge branch 'master' into ubuntu-master

[deb/packages.git] / lib / Packages / DoShow.pm

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 13afcbc4eadf6f09317ff99e057fe0c479f7eda7..846dda7820ee5775d89105a876e1e430b0d0980b 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -233,7 +233,7 @@ sub do_show {
                            if ( ($suite ne "experimental")
                                 && ($subsection ne 'debian-installer')
                                 && ($suite !~ /-(backports|updates)$/)
-                                && ($suite !~ /dapper/)) {
+                                && ($suite !~ /(dapper|intrepid)/)) {
                                $d{contents_avail} = 1;
                            }
                            push @downloads, \%d;
@@ -386,12 +386,16 @@ sub moreinfo {
 
     if ($info{maintainers}) {
        my $uploaders = $page->get_src( 'uploaders' );
+       my $orig_uploaders = $page->get_src( 'orig_uploaders' );
        if ($uploaders && @$uploaders) {
            my @maintainers = map { { name => $_->[0], mail => $_->[1] } } @$uploaders;
            $contents->{maintainers} = \@maintainers;
        }
+       if ($orig_uploaders && @$orig_uploaders) {
+           my @orig_maintainers = map { { name => $_->[0], mail => $_->[1] } } @$orig_uploaders;
+           $contents->{original_maintainers} = \@orig_maintainers;
+       }
     }
-
 }
 
 sub providers {