Merge branch 'master' into archive-master

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

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 1d41c3a98c964d6ab235527a06936bffb7a12c39..9f59690589d59ec1745a27dc937fd24ee2bda1b3 100644 (file)
--- 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
@@ -230,7 +230,7 @@ sub do_show {
 
                            $d{version} = $versions->{$a} if $multiple_versions;
                            $d{archive} = $archives->{$a};
-                           if ( ($suite ne "experimental")
+                           if ( ($suite ne "woody") && ($suite ne "bo")
                                 && ($subsection ne 'debian-installer')) {
                                $d{contents_avail} = 1;
                            }
@@ -241,11 +241,13 @@ sub do_show {
                        #
                        # more information
                        #
+                       my $changesandcopy = 0;
+                       $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                        moreinfo( name => $pkg, data => $page, vars => \%contents,
                                  opts => $opts,
                                  env => \%FTP_SITES,
                                  bugreports => 1, sourcedownload => 1,
-                                 changesandcopy => 1, maintainers => 1,
+                                 changesandcopy => $changesandcopy, maintainers => 1,
                                  search => 1 );
                    } else { # unless $page->is_virtual
                        $contents{is_virtual} = 1;
@@ -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} );
                    }
 
                    #
@@ -321,11 +323,13 @@ sub do_show {
                    #
                    # more information
                    #
+                   my $changesandcopy = 0;
+                   $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                    moreinfo( name => $pkg, data => $page, vars => \%contents,
                              opts => $opts,
                              env => \%FTP_SITES,
                              bugreports => 1,
-                             changesandcopy => 1, maintainers => 1,
+                             changesandcopy => $changesandcopy, maintainers => 1,
                              search => 1, is_source => 1 );
 
                } # else (unless $opts->{source})
@@ -356,6 +360,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' );
@@ -442,7 +447,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 +495,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 ) {