X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=0c65ec1819a26f9cc021cfb0737b28cc066791f4;hp=38b34fbe2abc736c37447a26e8c9db016ed47c4e;hb=994eceb69bd5a8865a51e00b3cfb1c7a1f03f78e;hpb=2b31e222e12852e8f3ac6a9aa14ae684c1144b8e

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 38b34fb..0c65ec1 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -89,7 +89,7 @@ sub do_show {
 		    for my $entry (@results) {
 			debug( join(":", @$entry), 1 ) if DEBUG;
 			my (undef, $archive, undef, $arch, $section, $subsection,
-			    $priority, $version, $provided_by) = @$entry;
+			    $priority, $version, undef, $provided_by) = @$entry;
 			
 			if ($arch ne 'virtual') {
 			    my %data = split /\000/, $packages_all{"$pkg $arch $version"};
@@ -440,11 +440,23 @@ 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 $arch = $entry->[3];
 	    my $archive = $entry->[1];
 	    my $p_suite = $entry->[2];
 	    if ( $short_desc ) {
 		$rel_alt_out{desc} = $short_desc;
+		my $trans_desc = $desctrans{$desc_md5};
+		if ($trans_desc) {
+		    my %trans_desc = split /\000|\001/, $trans_desc;
+		    my %sdescs;
+		    while (my ($l, $d) = each %trans_desc) {
+			$d =~ s/\n.*//os;
+
+			$sdescs{$l} = $d;
+		    }
+		    $rel_alt_out{trans_desc} = \%sdescs;
+		}
 		$rel_alt_out{suite} = $p_suite;
 		if ( $rel_out{is_old_pkgs} ) {
 		} elsif (defined $entry->[1]) {
@@ -483,10 +495,22 @@ sub pkg_list {
 
 	# we don't deal with virtual packages here because for the
 	# current uses of this function this isn't needed
-	my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1];
+	my $data = read_entry_simple( $packages, $p, $opts->{h_archives}, $suite);
+	my ($desc_md5, $short_desc) = ($data->[-2],$data->[-1]);
 
 	if ( $short_desc ) {
-	    push @$list, { name => $p, desc => $short_desc, available => 1 };
+	    my $trans_desc = $desctrans{$desc_md5};
+	    my %sdescs;
+	    if ($trans_desc) {
+		my %trans_desc = split /\000|\001/, $trans_desc;
+		while (my ($l, $d) = each %trans_desc) {
+		    $d =~ s/\n.*//os;
+
+		    $sdescs{$l} = $d;
+		}
+	    }
+	    push @$list, { name => $p, desc => $short_desc,
+			   trans_desc => \%sdescs, available => 1 };
 	} else {
 	    push @$list, { name => $p, desc => _g("Not available") };
 	}