for my $entry (@results) {
debug( join(":", @$entry), 1 );
my (undef, $archive, undef, $arch, $section, $subsection,
- $priority, $version) = @$entry;
+ $priority, $version, @provided_by) = @$entry;
- my %data = split /\000/, $packages_all{"$pkg $arch $version"};
- $data{package} = $pkg;
- $data{architecture} = $arch;
- $data{version} = $version;
- $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+ if ($arch ne 'virtual') {
+ my %data = split /\000/, $packages_all{"$pkg $arch $version"};
+ $data{package} = $pkg;
+ $data{architecture} = $arch;
+ $data{version} = $version;
+ $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+ } else {
+ $page->add_provided_by(\@provided_by);
+ }
}
$version = $page->{newest};
$package_page .= simple_menu( [ gettext( "Distribution:" ),
gettext( "Overview over this suite" ),
- "/$suite/",
+ "$ROOT/$suite/",
$suite ],
[ gettext( "Section:" ),
gettext( "All packages in this section" ),
- "/$suite/$subsection/",
+ "$ROOT/$suite/$subsection/",
$subsection ],
);
$package_page .= "<th>".gettext("Architecture")."</th><th>".gettext("Files")."</th><th>".gettext( "Package Size")."</th><th>".gettext("Installed Size")."</th></tr>\n";
foreach my $a ( @archs ) {
$package_page .= "<tr>\n";
- $package_page .= "<th><a href=\"$DL_URL?arch=$a";
- $package_page .= "&file=".uri_escape($filenames->{$a});
- $package_page .= "&md5sum=$file_md5sums->{$a}";
- $package_page .= "&arch=$a";
- for ($archives->{$a}) {
- /security/o && do {
- $package_page .= "&type=security"; last };
- /volatile/o && do {
- $package_page .= "&type=volatile"; last };
- /backports/o && do {
- $package_page .= "&type=backports"; last };
- /non-us/io && do {
- $package_page .= "&type=nonus"; last };
- $package_page .= "&type=main";
- }
+ $package_page .= "<th><a href=\"$ROOT/$suite/$encodedpkg/$a/download";
$package_page .= "\">$a</a></th>\n";
$package_page .= "<td>";
if ( $suite ne "experimental" ) {
- $package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n", "$FILELIST_URL$encodedpkg&version=$suite&arch=$a", $pkg );
+ $package_page .= sprintf( "[<a href=\"%s\">".gettext( "list of files" )."</a>]\n",
+ "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg );
} else {
$package_page .= gettext( "no current information" );
}
- $package_page .= "</td>\n<td>";
- $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10;
- $package_page .= "</td>\n<td>";
- $package_page .= $sizes_inst->{$a};
+ $package_page .= "</td>\n<td align=right>"; #FIXME: css
+ $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB";
+ $package_page .= "</td>\n<td align=right>"; #FIXME: css
+ $package_page .= $sizes_inst->{$a} . " kB";
$package_page .= "</td>\n</tr>";
}
- $package_page .= "</table><p>".gettext ( "Size is measured in kBytes." )."</p>\n";
+ $package_page .= "</table>\n";
$package_page .= "</div> <!-- end pdownload -->\n";
#
my (undef, $archive, undef, $section, $subsection,
$priority, $version) = @$entry;
- my $data = $sources_all{"$pkg $version"};
- $page->merge_data($pkg, $version, $data) or debug( "Merging $pkg $version FAILED", 2 );
+ my $data = $sources_all{"$archive $suite $pkg"};
+ $page->merge_data($pkg, $suite, $archive, $data) or debug( "Merging $pkg $version FAILED", 2 );
}
$version = $page->{version};
gettext("Size (in kB)"),
gettext("md5sum") );
foreach( @$source_files ) {
- my ($src_file_md5, $src_file_size, $src_file_name) = @$_;
+ my ($src_file_md5, $src_file_size, $src_file_name)
+ = split /\s+/, $_;
my $src_url;
for ($archive) {
/security/o && do {
}
}
-#use Data::Dumper;
-#debug( "Final page object:\n".Dumper($page), 3 );
+use Data::Dumper;
+debug( "Final page object:\n".Dumper($page), 3 );
my $title = $opts{source} ?
"Details of source package <em>$pkg</em> in $suite" :