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 5d6174c734d5f5ba0d0a395ffda1daaec3a877a5..3964e7853ed54d30aa7635cc94e96b854383c9de 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -14,7 +14,6 @@ use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
                         @ARCHITECTURES %FTP_SITES
                         @LANGUAGES @DDTP_LANGUAGES);
-use Packages::I18N::Locale;
 use Packages::CGI qw( :DEFAULT make_url make_search_url );
 use Packages::DB;
 use Packages::Search qw( :all );
@@ -202,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 +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;
                            }
@@ -246,7 +245,7 @@ sub do_show {
                                  opts => $opts,
                                  env => \%FTP_SITES,
                                  bugreports => 1, sourcedownload => 1,
-                                 changesandcopy => 1, maintainers => 1,
+                                 changesandcopy => 0, maintainers => 1,
                                  search => 1 );
                    } else { # unless $page->is_virtual
                        $contents{is_virtual} = 1;
@@ -255,7 +254,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}
@@ -287,7 +286,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} );
                    }
 
                    #
@@ -326,7 +325,7 @@ sub do_show {
                              opts => $opts,
                              env => \%FTP_SITES,
                              bugreports => 1,
-                             changesandcopy => 1, maintainers => 1,
+                             changesandcopy => 0, maintainers => 1,
                              search => 1, is_source => 1 );
 
                } # else (unless $opts->{source})
@@ -443,7 +442,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];
@@ -491,7 +490,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 ) {