\n/go; - $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo;
+ sub process_description {
+ my ($desc) = @_;
+
+ my $short_desc = encode_entities( $1, "<>&\"" )
+ if $desc =~ s/^(.*)$//m;
+ my $long_desc = encode_entities( $desc, "<>&\"" );
- $contents{desc} = { short => $short_desc,
- long => $long_desc, };
+ $long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; # syntax highlighting -> '];
+ $long_desc =~ s/\A //o;
+ $long_desc =~ s/\n /\n/sgo;
+ $long_desc =~ s/\n.\n/\n\n/go;
+ $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo;
+
+ return ($short_desc, $long_desc);
+ }
+
+ my $desc = $descriptions{$did};
+ my $long_desc;
+ ($short_desc, $long_desc) = process_description($desc);
+
+ $contents{desc}{en} = { short => $short_desc,
+ long => $long_desc, };
+
+ debug( "desc_md5=$desc_md5", 2)
+ if DEBUG;
+ my $trans_desc = $desctrans{$desc_md5};
+ if ($trans_desc) {
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ my %all_langs = map { $_ => 1 } (@LANGUAGES, keys %trans_desc);
+ $contents{used_langs} = [ keys %all_langs ];
+ debug( "TRANSLATIONS: ".join(" ",keys %trans_desc), 2)
+ if DEBUG;
+ while (my ($l, $d) = each %trans_desc) {
+ my ($short_t, $long_t) = process_description($d);
+
+ $contents{desc}{$l} = { short => $short_t,
+ long => $long_t, };
+ }
+ }
my $v_str = $version;
my $multiple_versions = grep { $_ ne $version } values %$versions;
- $v_str .= _g(" and others") if $multiple_versions;
+ $v_str .= $cat->g(" and others") if $multiple_versions;
$contents{versions} = { short => $v_str,
multiple => $multiple_versions };
@@ -162,6 +206,9 @@ sub do_show {
#
# display dependencies
#
+ build_deps( \%packages, $opts, $pkg,
+ $page->get_dep_field('pre-depends'),
+ 'depends', \%contents );
build_deps( \%packages, $opts, $pkg,
$page->get_dep_field('depends'),
'depends', \%contents );
@@ -178,10 +225,11 @@ sub do_show {
my @downloads;
foreach my $a ( @archs ) {
my %d = ( arch => $a,
- pkgsize => sprintf( '%.1f', floor(($sizes_deb->{$a}/102.4)+0.5)/10 ),
+ pkgsize => floor(($sizes_deb->{$a}/102.4)+0.5)/10,
instsize => $sizes_inst->{$a}, );
$d{version} = $versions->{$a} if $multiple_versions;
+ $d{archive} = $archives->{$a};
if ( ($suite ne "experimental")
&& ($subsection ne 'debian-installer')) {
$d{contents_avail} = 1;
@@ -201,13 +249,9 @@ sub do_show {
search => 1 );
} else { # unless $page->is_virtual
$contents{is_virtual} = 1;
- $contents{desc}{short} = _g( "virtual package" );
+ $contents{desc}{short} = $cat->g( "virtual package" );
$contents{subsection} = 'virtual';
- my $policy_url = 'http://www.debian.org/doc/debian-policy/';
- note( sprintf( _g( 'This is a virtual package. See the Debian policy for a definition of virtual packages.' ),
- $policy_url, $policy_url ));
-
my $provided_by = $page->{provided_by};
$contents{providers} = [];
pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} );
@@ -265,13 +309,12 @@ sub do_show {
foreach( @$source_files ) {
my ($src_file_md5, $src_file_size, $src_file_name)
= split /\s+/, $_;
- (my $server = lc $archive) =~ s/-//go; # non-US hack
- $server = $FTP_SITES{$server}
+ my $server = $FTP_SITES{lc $archive}
|| $FTP_SITES{us};
my $path = "/$source_dir/$src_file_name";
push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
- size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
+ size => floor(($src_file_size/102.4)+0.5)/10,
md5sum => $src_file_md5 };
}
@@ -319,17 +362,10 @@ sub moreinfo {
if (defined($files) and @$files) {
foreach( @$files ) {
my ($src_file_md5, $src_file_size, $src_file_name) = split /\s/o, $_;
- my ($name, $server, $path);
- # non-US hack
- ($server = lc $page->get_newest('archive')) =~ s/-//go;
- $server = $env->{$server}||$env->{us};
- $path = "$src_dir/$src_file_name";
- if ($src_file_name =~ /dsc$/) {
- $name = 'dsc'
- } else {
- $name = $src_file_name;
- }
- push @downloads, { name => $name, server => $server, path => $path };
+ my ($server, $path);
+ $server = $env->{lc $page->get_newest('archive')}||$env->{us};
+ $path = "/$src_dir/$src_file_name";
+ push @downloads, { name => $src_file_name, server => $server, path => $path };
}
}
$contents->{src}{downloads} = \@downloads;
@@ -340,7 +376,6 @@ sub moreinfo {
(my $src_basename = $source_version) =~ s,^\d+:,,; # strip epoche
$src_basename = "${source}_$src_basename";
$src_dir =~ s,pool/updates,pool,o;
- $src_dir =~ s,pool/non-US,pool,o;
$contents->{files}{changelog}{path} = "$src_dir/$src_basename/changelog";
$contents->{files}{copyright}{path} = "$src_dir/$src_basename/".( $is_source ? 'copyright' : "$name.copyright" );
@@ -372,6 +407,7 @@ sub build_deps {
'suggests' => 'sug', 'build-depends' => 'adep',
'build-depends-indep' => 'idep' );
my $suite = $opts->{suite}[0];
+ my $cat = $opts->{cat};
my %out = ( id => $dep_type{$type}, terms => [] );
@@ -390,7 +426,7 @@ sub build_deps {
if ($arch_str ||= '') {
if ($arch_neg) {
- $arch_str = _g("not")." $arch_str";
+ $arch_str = $cat->g("not %s", "$arch_str" );
} else {
$arch_str = $arch_str;
}
@@ -406,11 +442,23 @@ 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 $arch = $entry->[3];
my $archive = $entry->[1];
my $p_suite = $entry->[2];
if ( $short_desc ) {
$rel_alt_out{desc} = $short_desc;
+ my $trans_desc = $desctrans{$desc_md5};
+ if ($trans_desc) {
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ my %sdescs;
+ while (my ($l, $d) = each %trans_desc) {
+ $d =~ s/\n.*//os;
+
+ $sdescs{$l} = $d;
+ }
+ $rel_alt_out{trans_desc} = \%sdescs;
+ }
$rel_alt_out{suite} = $p_suite;
if ( $rel_out{is_old_pkgs} ) {
} elsif (defined $entry->[1]) {
@@ -428,7 +476,7 @@ sub build_deps {
}
} elsif ( $rel_out{is_old_pkgs} ) {
} else {
- $rel_alt_out{desc} = _g( "Package not available" );
+ $rel_alt_out{desc} = $cat->g( "Package not available" );
$rel_alt_out{suite} = '';
}
push @{$rel_out{alternatives}}, \%rel_alt_out;
@@ -449,12 +497,25 @@ sub pkg_list {
# we don't deal with virtual packages here because for the
# current uses of this function this isn't needed
- my $short_desc = (read_entry_simple( $packages, $p, $opts->{h_archives}, $suite))->[-1];
+ my $data = read_entry_simple( $packages, $p, $opts->{h_archives}, $suite);
+ my ($desc_md5, $short_desc) = ($data->[-2],$data->[-1]);
if ( $short_desc ) {
- push @$list, { name => $p, desc => $short_desc, available => 1 };
+ my $trans_desc = $desctrans{$desc_md5};
+ my %sdescs;
+ if ($trans_desc) {
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ while (my ($l, $d) = each %trans_desc) {
+ $d =~ s/\n.*//os;
+
+ $sdescs{$l} = $d;
+ }
+ }
+ push @$list, { name => $p, desc => $short_desc,
+ trans_desc => \%sdescs, available => 1 };
} else {
- push @$list, { name => $p, desc => _g("Not available") };
+ push @$list, { name => $p,
+ desc => $opts->{cat}->g("Not available") };
}
}
}