";
- $str .= sprintf( "
".gettext( "More Information on %s" )."
",
+ $str .= sprintf( "
"._g( "More Information on %s" )."
",
$name );
if ($info{bugreports}) {
my $bug_url = $is_source ? $SRC_BUG_URL : $BUG_URL;
- $str .= "
\n".sprintf( gettext( "Check for Bug Reports about %s." )."
\n",
+ $str .= "
\n".sprintf( _g( "Check for Bug Reports about %s." )."
\n",
$bug_url.$name, $name );
}
@@ -127,19 +127,16 @@ sub pmoreinfo {
my $src_dir = $page->get_src('directory');
if ($info{sourcedownload}) {
my $files = $page->get_src( 'files' );
- my $path = (@{$opts->{archive}} >1) ?
- $suite :
- "$suite/$opts->{archive}[0]";
- $str .= gettext( "Source Package:" );
- $str .= " $source, ".
- gettext( "Download" ).":\n";
+ $str .= _g( "Source Package:" );
+ $str .= " 'source'})."\">$source, ".
+ _g( "Download" ).":\n";
unless (defined($files) and @$files) {
- $str .= gettext( "Not found" );
+ $str .= _g( "Not found" );
} else {
foreach( @$files ) {
my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
- for ($page->get_newest('archive')) {
+ for ("$suite/".$page->get_newest('archive')) {
/security/o && do {
$str .= "{security}/$src_dir/$src_file_name\">["; last };
/volatile/o && do {
@@ -147,7 +144,7 @@ sub pmoreinfo {
/backports/o && do {
$str .= "{backports}/$src_dir/$src_file_name\">["; last };
/non-us/io && do {
- $str .= "{nonus_site}/$src_dir/$src_file_name\">["; last };
+ $str .= "{'non-US'}/$src_dir/$src_file_name\">["; last };
$str .= "{us}/$src_dir/$src_file_name\">[";
}
if ($src_file_name =~ /dsc$/) {
@@ -158,7 +155,7 @@ sub pmoreinfo {
$str .= "]\n";
}
}
-# $package_page .= sprintf( gettext( " (These sources are for version %s)\n" ), $src_version )
+# $package_page .= sprintf( _g( " (These sources are for version %s)\n" ), $src_version )
# if ($src_version ne $version) && !$src_version_given_in_control;
}
@@ -168,12 +165,12 @@ sub pmoreinfo {
$src_basename = "${source}_$src_basename";
$src_dir =~ s,pool/updates,pool,o;
$src_dir =~ s,pool/non-US,pool,o;
- $str .= "
".sprintf( gettext( "View the Debian changelog" ),
+ $str .= "
".sprintf( _g( 'View the Debian changelog' ),
"$CHANGELOG_URL/$src_dir/$src_basename/changelog" )."
\n";
my $copyright_url = "$CHANGELOG_URL/$src_dir/$src_basename/";
$copyright_url .= ( $is_source ? 'copyright' : "$name.copyright" );
- $str .= sprintf( gettext( "View the copyright file" ),
+ $str .= sprintf( _g( 'View the copyright file' ),
$copyright_url )."
";
}
}
@@ -186,7 +183,7 @@ sub pmoreinfo {
}
my ($maint_name, $maint_mail) = @{shift @$uploaders};
unless (@$uploaders) {
- $str .= "
\n".sprintf( gettext( "%s is responsible for this Debian package." ).
+ $str .= "
\n".sprintf( _g( "%s is responsible for this Debian package." ).
"\n",
"$maint_name"
);
@@ -198,18 +195,18 @@ sub pmoreinfo {
}
my $last_up = pop @uploaders_str;
$up_str .= ", ".join ", ", @uploaders_str if @uploaders_str;
- $up_str .= sprintf( gettext( " and %s are responsible for this Debian package." ), $last_up );
+ $up_str .= sprintf( _g( " and %s are responsible for this Debian package." ), $last_up );
$str .= "
\n$up_str ";
}
}
- $str .= sprintf( gettext( "See the developer information for %s." )."
", $QA_URL.$source, $name ) if $source;
+ $str .= sprintf( _g( "See the
developer information for %s." )."", $QA_URL.$source, $name ) if $source;
}
if ($info{search}) {
my $encodedname = uri_escape( $name );
my $search_url = $is_source ? "$ROOT/source" : $ROOT;
- $str .= "
".sprintf( gettext( "Search for other versions of %s" ),
+ $str .= "
".sprintf( _g( "Search for other versions of %s" ),
"$search_url/$encodedname", $name )."
\n";
}
@@ -218,13 +215,11 @@ sub pmoreinfo {
}
sub dep_item {
- my ( $link, $name, $info, $desc ) = @_;
- my $post_link = '';
- if ($link) {
- $link = "
";
+ my ( $suite, $name, $info, $desc ) = @_;
+ my ($link, $post_link) = ('', '');
+ if ($suite) {
+ $link = "$suite})."\">";
$post_link = '';
- } else {
- $link = '';
}
if ($info) {
$info = " $info";
@@ -240,6 +235,20 @@ sub dep_item {
return "$link$name$post_link$info$desc";
} # end dep_item
+sub provides_string {
+ my ($suite, $entry, $also) = @_;
+ my %tmp = map { $_ => 1 } split /\s/, $entry;
+ my @provided_by = keys %tmp; # weed out duplicates
+ my $short_desc = $also ? _g("also a virtual package provided by ")
+ : _g("virtual package provided by ");
+ if (@provided_by < 10) {
+ $short_desc .= join( ', ',map { "
$suite})."\">$_" } @provided_by);
+ } else {
+ $short_desc .= sprintf( _g("%s packages"), scalar(@provided_by));
+ }
+ return $short_desc;
+}
+
sub print_deps {
my ( $packages, $opts, $pkg, $relations, $type) = @_;
my %dep_type = ('depends' => 'dep', 'recommends' => 'rec',
@@ -248,10 +257,9 @@ sub print_deps {
my $res = "
\n";
my $first = 1;
my $suite = $opts->{suite}[0];
- my $one_archive = @{$opts->{archive}} > 1 ? '': $opts->{archive}[0];
# use Data::Dumper;
-# debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 );
+# debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 ) if DEBUG;
foreach my $rel (@$relations) {
my $is_old_pkgs = $rel->[0];
@@ -276,7 +284,7 @@ sub print_deps {
if ($arch_str ||= '') {
if ($arch_neg) {
- $arch_str = " [".gettext("not")." $arch_str]";
+ $arch_str = " ["._g("not")." $arch_str]";
} else {
$arch_str = " [$arch_str]";
}
@@ -288,34 +296,38 @@ sub print_deps {
my $entry = $entries{$p_name} ||
read_entry_simple( $packages, $p_name, $opts->{h_archives}, $suite);
my $short_desc = $entry->[-1];
- my $arch = $entry->[2];
- my $archive = $entry->[0];
+ my $arch = $entry->[3];
+ my $archive = $entry->[1];
+ my $p_suite = $entry->[2];
if ( $short_desc ) {
- my $path = $one_archive eq $archive ? "$suite/$archive" :
- $suite;
if ( $is_old_pkgs ) {
- push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
+ push @res_pkgs, dep_item( $p_suite,
$p_name, "$pkg_version$arch_str" );
- } elsif ($arch eq 'virtual') {
- $short_desc = "virtual package";
- push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
- $p_name, "$pkg_version$arch_str", $short_desc );
- } else {
+ } elsif (defined $entry->[1]) {
$entries{$p_name} ||= $entry;
$short_desc = encode_entities( $short_desc, "<>&\"" );
- push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
+ $short_desc .= "
".provides_string( $p_suite,
+ $entry->[0],
+ 1 )
+ if defined $entry->[0];
+ push @res_pkgs, dep_item( $p_suite,
+ $p_name, "$pkg_version$arch_str", $short_desc );
+ } elsif (defined $entry->[0]) {
+ $short_desc = provides_string( $p_suite,
+ $entry->[0] );
+ push @res_pkgs, dep_item( $p_suite,
$p_name, "$pkg_version$arch_str", $short_desc );
}
} elsif ( $is_old_pkgs ) {
push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str" );
} else {
- my $short_desc = gettext( "Package not available" );
+ my $short_desc = _g( "Package not available" );
push @res_pkgs, dep_item( undef, $p_name, "$pkg_version$arch_str", $short_desc );
}
}
- $res .= "\n".join( "- ".gettext( "or" )." ", @res_pkgs )."\n";
+ $res .= "\n".join( "
- "._g( "or" )." ", @res_pkgs )."\n";
}
if (@$relations) {
$res .= "\n";
@@ -376,65 +388,68 @@ sub header {
$checked_searchon{names} = "checked=\"checked\""
if $values{searchon} eq 'default';
$search_in_header = <