X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=cfe7a90f783ff8486ae74f909dc1b6ed06c6de36;hb=f9b7f76ea7a996e9dbf07201257ef5e66bff5f9b;hp=87320e8b65fface9a5f31d7eb0993c5af7c7d54b;hpb=78869ba170e4ca1db9f8a0dc7be33f09947b0ed2;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 87320e8..cfe7a90 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 = 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~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$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 );
@@ -204,10 +223,6 @@ sub do_show {
$contents{desc}{short} = _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} );