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 9d6df68541f240871f633e7beeb48e66fd2e1ac2..9f59690589d59ec1745a27dc937fd24ee2bda1b3 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -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;
@@ -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})