Merge commit 'origin/master'

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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index f40d1a21553eb5785eda35c072d9c6eaabb53dc6..11c8db793f59da1018a13bac5cd58d194c6fc31b 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -230,8 +230,7 @@ sub do_show {
 
                            $d{version} = $versions->{$a} if $multiple_versions;
                            $d{archive} = $archives->{$a};
-                           if ( ($suite ne "experimental")
-                                && ($subsection ne 'debian-installer')) {
+                           if ($subsection ne 'debian-installer') {
                                $d{contents_avail} = 1;
                            }
                            push @downloads, \%d;
@@ -356,6 +355,7 @@ sub moreinfo {
     if ($info{sourcedownload}) {
        $contents->{src}{url} = make_url($source,'',{source=>'source'});
        $contents->{src}{pkg} = $source;
+       $contents->{src}{version} = $source_version;
 
        my @downloads;
        my $files = $page->get_src( 'files' );
@@ -384,12 +384,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 {