X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=7d5c16b3e4f71b609f12f655b9634e900b6eed9c;hb=fdc82fe76a3798aea76fdfa7c14f89981a40fb07;hp=08eb376d236ddb237999af2258cae7048eabb64d;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 08eb376..7d5c16b 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -75,19 +75,13 @@ sub do_show {
 	    foreach (@results, @non_results) {
 		my $a = $_->[1];
 		my $s = $_->[2];
-		if ($a =~ /^(?:us|security|non-US)$/o) {
-		    $all_suites{$s}++;
-		} else {
-		    $all_suites{"$s/$a"}++;
-		}
+		$all_suites{$s}++;
 	    }
 	    foreach (suites_sort(keys %all_suites)) {
-		if (("$suite/$archive" eq $_)
-		    || (!$all_suites{"$suite/$archive"} && ($suite eq $_))) {
+		if ($suite eq $_) {
 		    $$menu .= "[ <strong>$_</strong> ] ";
 		} else {
-		    $$menu .=
-			"[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
+		    $$menu .= "[ <a href=\"$ROOT/$_/$encodedpkg\">$_</a> ] ";
 		}
 	    }
 	    $$menu .= '<br>';
@@ -106,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]);
 			}
@@ -159,11 +154,15 @@ sub do_show {
 						 _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 $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'
@@ -236,7 +235,7 @@ sub do_show {
 			    $package_page .=  "\">$a</a></th>\n";
 			    $package_page .= "<td>".$versions->{$a}."</td>"
 				if $multiple_versions;
-			    $package_page .= '</td><td class="size">';
+			    $package_page .= '<td class="size">';
 			    $package_page .=  floor(($sizes_deb->{$a}/102.4)+0.5)/10 . "&nbsp;kB";
 			    $package_page .= '</td><td class="size">';
 			    $package_page .=  $sizes_inst->{$a} . "&nbsp;kB";
@@ -308,11 +307,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 ],
 					   );