X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPackages%2FDoShow.pm;h=076e11f7c3826a909ed459b412eb7a2e898c6b3f;hb=48d5454d1a9475bff05c755aed312f991dcb2aed;hp=b426ce0c674b0863be668a2e164024756f9343fd;hpb=d712994b08af4e71e52930ddf1081f1e13384573;p=deb%2Fpackages.git diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index b426ce0..076e11f 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -100,7 +100,8 @@ sub do_show { $data{package} = $pkg; $data{architecture} = $arch; $data{version} = $version; - $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG; + $page->merge_package(\%data) + or debug( "Merging $pkg $arch $version FAILED", 2 ) if DEBUG; } else { $page->add_provided_by([split /\s+/, $provided_by]); } @@ -144,20 +145,20 @@ sub do_show { $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo; # $long_desc = conv_desc( $lang, $long_desc ); # $short_desc = conv_desc( $lang, $short_desc ); - - $$menu .= simple_menu( [ _g( "Distribution:" ), - _g( "Overview over this suite" ), - "$ROOT/$suite/", - $suite ], - [ _g( "Section:" ), - _g( "All packages in this section" ), - "$ROOT/$suite/$subsection/", - $subsection ], - [ _g( "Source:" ), - _g( "Source package building this package" ), - "$ROOT/$suite/source/".$page->get_src('package'), - $page->get_src('package') ], - ); + my @menu = ( [ _g( "Distribution:" ), + _g( "Overview over this suite" ), + "$ROOT/$suite/", + $suite ], + [ _g( "Section:" ), + _g( "All packages in this section" ), + "$ROOT/$suite/$subsection/", + $subsection ], ); + my $source = $page->get_src('package'); + push @menu, [ _g( "Source:" ), + _g( "Source package building this package" ), + "$ROOT/$suite/source/$source", + $source ] if $source; + $$menu .= simple_menu( @menu ); my $v_str = $version; my $multiple_versions = grep { $_ ne $version } values %$versions; @@ -202,9 +203,6 @@ sub do_show { if ( $dep_list ) { $package_page .= "\n"; $package_page .= sprintf( ""._g( "Other Packages Related to %s" )."
\n", $pkg ); - if ($suite eq "experimental") { - note( sprintf( _g( 'Note that the experimental distribution is not self-contained; missing dependencies are likely found in the unstable distribution.' ), "$ROOT/unstable/" ) ); - } $package_page .= pdeplegend( [ 'dep', _g( 'depends' ) ], [ 'rec', _g( 'recommends' ) ], @@ -234,7 +232,7 @@ sub do_show { $package_page .= "\">$a\n"; $package_page .= "".$versions->{$a}." " if $multiple_versions; - $package_page .= ''; + $package_page .= ' '; $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB"; $package_page .= ' '; $package_page .= $sizes_inst->{$a} . " kB"; @@ -306,11 +304,11 @@ sub do_show { $$menu .= simple_menu( [ _g( "Distribution:" ), _g( "Overview over this suite" ), - "/$suite/", + "$ROOT/$suite/", $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "/$suite/$subsection/", + "$ROOT/$suite/$subsection/", $subsection ], ); @@ -355,10 +353,6 @@ sub do_show { if ( $dep_list ) { $package_page .= " \n"; $package_page .= sprintf( ""._g( "Other Packages Related to %s" )."
\n", $pkg ); - if ($suite eq "experimental") { - note( sprintf( _g( 'Note that the experimental distribution is not self-contained; missing dependencies are likely found in the unstable distribution.' ), "$ROOT/unstable/" ) ); - - } $package_page .= pdeplegend( [ 'adep', _g( 'build-depends' ) ], [ 'idep', _g( 'build-depends-indep' ) ], @@ -387,7 +381,7 @@ sub do_show { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s+/, $_; my $src_url; - for ($archive) { + for ("$suite/$archive") { /security/o && do { $src_url = $FTP_SITES{security}; last }; /volatile/o && do {