\n/go; $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 ],
- );
+ my @menu = ( [ _g( "Distribution:" ),
+ _g( "Overview over this suite" ),
+ make_url("/",''),
+ $suite ],
+ [ _g( "Section:" ),
+ _g( "All packages in this section" ),
+ make_url("$subsection/",''),
+ $subsection ], );
+ my $source = $page->get_src('package');
+ push @menu, [ _g( "Source:" ),
+ _g( "Source package building this package" ),
+ make_url($source,'',{source=>'source'}),
+ $source ] if $source;
+ $$menu .= simple_menu( @menu );
my $v_str = $version;
my $multiple_versions = grep { $_ ne $version } values %$versions;
- $v_str .= " (and others)" if $multiple_versions;
+ $v_str .= _g(" and others") if $multiple_versions;
my $title .= sprintf( _g( "Package: %s (%s)" ), $pkg, $v_str );
$title .= " ".marker( $archive ) if $archive ne 'us';
$title .= " ".marker( $subsection ) if $subsection eq 'non-US'
@@ -172,7 +170,7 @@ sub do_show {
$package_page .= title( $title );
if (my $provided_by = $page->{provided_by}) {
- note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) );
+ note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) );
}
if ($suite eq "experimental") {
@@ -204,9 +202,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' ) ],
@@ -232,18 +227,22 @@ sub do_show {
$package_page .= ""._g( "Package Size")." "._g("Installed Size")." "._g("Files")." \n";
foreach my $a ( @archs ) {
$package_page .= "\n";
- $package_page .= "$a \n";
$package_page .= "".$versions->{$a}." "
if $multiple_versions;
+ $package_page .= '';
+ # package size
+ $package_page .= sprintf(_g('%.1f kB'),
+ floor(($sizes_deb->{$a}/102.4)+0.5)/10);
$package_page .= ' ';
- $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB";
- $package_page .= ' ';
- $package_page .= $sizes_inst->{$a} . " kB";
+ # installed size
+ $package_page .= sprintf(_g('%d kB'),
+ $sizes_inst->{$a});
$package_page .= " \n";
if ( $suite ne "experimental" ) {
$package_page .= sprintf( "["._g( "list of files" )."]\n",
- "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg );
+ make_url("$encodedpkg/$a/filelist",''), $pkg );
} else {
$package_page .= _g( "no current information" );
}
@@ -266,11 +265,11 @@ sub do_show {
$$menu .= simple_menu( [ _g( "Distribution:" ),
_g( "Overview over this distribution" ),
- "$ROOT/",
+ make_url('/',''),
$suite ],
[ _g( "Section:" ),
_g( "All packages in this section" ),
- "$ROOT/$suite/virtual/",
+ make_url("virtual/",''),
'virtual' ], );
@@ -288,19 +287,19 @@ sub do_show {
} # else (unless $page->is_virtual)
} else { # unless $opts->{source}
for my $entry (@results) {
- debug( join(":", @$entry), 1 );
+ debug( join(":", @$entry), 1 ) if DEBUG;
my (undef, $archive, undef, $section, $subsection,
$priority, $version) = @$entry;
my $data = $sources_all{"$archive $suite $pkg"};
$page->merge_data($pkg, $suite, $archive, $data)
- or debug( "Merging $pkg $version FAILED", 2 );
+ or debug( "Merging $pkg $version FAILED", 2 ) if DEBUG;
}
$version = $page->{version};
my $st1 = new Benchmark;
my $std = timediff($st1, $st0);
- debug( "Data search and merging took ".timestr($std) );
+ debug( "Data search and merging took ".timestr($std) ) if DEBUG;
$archive = $page->get_newest( 'archive' );
$section = $page->get_newest( 'section' );
@@ -308,11 +307,11 @@ sub do_show {
$$menu .= simple_menu( [ _g( "Distribution:" ),
_g( "Overview over this suite" ),
- "/$suite/",
+ make_url('/',''),
$suite ],
[ _g( "Section:" ),
_g( "All packages in this section" ),
- "/$suite/$subsection/",
+ make_url("$subsection/",''),
$subsection ],
);
@@ -357,10 +356,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' ) ],
@@ -389,7 +384,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 {
@@ -426,7 +421,7 @@ sub do_show {
}
# use Data::Dumper;
-# debug( "Final page object:\n".Dumper($page), 3 );
+# debug( "Final page object:\n".Dumper($page), 3 ) if DEBUG;
my $title = $opts->{source} ?
_g( "Details of source package %s in %s" ) :