X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPackages%2FDoShow.pm;h=05baeff8ea08463ed9624692ff7b5d604f26e39b;hb=b688b16487ef2ca8ad7861d7c20da16a9f3f4448;hp=21bd9852d22019c3494eb69d17eba7ba9cece11d;hpb=41ab743eae0a7875cf03a8b50a060da06af30b39;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 21bd985..05baeff 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -119,8 +119,24 @@ sub do_show {
 			debug( "Data search and merging took ".timestr($std) ) if DEBUG;
 
 			my $did = $page->get_newest( 'description' );
-			my @tags = map { [ $_, $debtags{$_} ] } split(/, /, $page->get_newest( 'tag' ));
+			my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+			my @tags;
+			foreach (@complete_tags) {
+			    my ($facet, $tag) = split( /::/, $_, 2);
+			    # handle tags like devel::{lang:c,lang:c++}
+			    if ($tag =~ s/^\{(.+)\}$/$1/) {
+				foreach (split( /,/, $tag )) {
+				    next if $tag =~ /^special:/;
+				    push @tags, [ $facet, $_ ];
+				}
+			    } else {
+				next if $tag =~ /^special:/;
+				push @tags, [ $facet, $tag ];
+			    }
+			}
+
 			$contents{tags} = \@tags;
+			$contents{debtags_voc} = \%debtags;
 
 			$section = $page->get_newest( 'section' );
 			$contents{section} = $section;
@@ -139,7 +155,7 @@ sub do_show {
 			$short_desc = encode_entities( $1, "<>&\"" )
 			    if $desc =~ s/^(.*)$//m;
 			my $long_desc = encode_entities( $desc, "<>&\"" );
-			
+
 			$long_desc =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go; # syntax highlighting -> '];
 			$long_desc =~ s/\A //o;
 			$long_desc =~ s/\n /\n/sgo;
@@ -162,6 +178,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 );
@@ -182,6 +201,7 @@ sub do_show {
 				      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;