X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=846dda7820ee5775d89105a876e1e430b0d0980b;hb=0b5667823629cdb055a2fe44fd16a9ff2ddae306;hp=1d41c3a98c964d6ab235527a06936bffb7a12c39;hpb=58039945e72bbba9d7395e78df27f028479f00d3;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 1d41c3a..846dda7 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -201,7 +201,7 @@ sub do_show {
 
 			my $provided_by = $page->{provided_by};
 			$contents{providers} = [];
-			pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} ) if $provided_by;
+			pkg_list( \%packages, $opts, $provided_by, $contents{providers} ) if $provided_by;
 
 			#
 			# display dependencies
@@ -231,7 +231,9 @@ sub do_show {
 			    $d{version} = $versions->{$a} if $multiple_versions;
 			    $d{archive} = $archives->{$a};
 			    if ( ($suite ne "experimental")
-				 && ($subsection ne 'debian-installer')) {
+				 && ($subsection ne 'debian-installer')
+				 && ($suite !~ /-(backports|updates)$/)
+				 && ($suite !~ /(dapper|intrepid)/)) {
 				$d{contents_avail} = 1;
 			    }
 			    push @downloads, \%d;
@@ -254,7 +256,7 @@ sub do_show {
 
 			my $provided_by = $page->{provided_by};
 			$contents{providers} = [];
-			pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} );
+			pkg_list( \%packages, $opts, $provided_by, $contents{providers} );
 
 		    } # else (unless $page->is_virtual)
 		} else { # unless $opts->{source}
@@ -286,7 +288,7 @@ sub do_show {
 		    my $binaries = find_binaries( $pkg, $archive, $suite, \%src2bin );
 		    if ($binaries && @$binaries) {
 			$contents{binaries} = [];
-			pkg_list( \%packages, $opts, $binaries, 'en', $contents{binaries} );
+			pkg_list( \%packages, $opts, $binaries, $contents{binaries} );
 		    }
 
 		    #
@@ -384,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 {
@@ -442,7 +448,7 @@ sub build_deps {
 	    my $entry = $entries{$p_name} ||
 		read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
 	    my $short_desc = $entry->[-1];
-	    my $desc_md5 = $entry->[-2];
+	    my $desc_md5 = $entry->[-2] || '';
 	    my $arch = $entry->[3];
 	    my $archive = $entry->[1];
 	    my $p_suite = $entry->[2];
@@ -490,7 +496,7 @@ sub build_deps {
 } # end print_deps
 
 sub pkg_list {
-    my ( $packages, $opts, $pkgs, $lang, $list ) = @_;
+    my ( $packages, $opts, $pkgs, $list ) = @_;
     my $suite = $opts->{suite}[0];
 
     foreach my $p ( sort @$pkgs ) {