[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.5.3-76-g8dcdf1c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 05a5e4e197c3ba54b486142196e313ed9081456c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 31 22:51:34 2010 +0200

    Eliminate deprecated {vt:N} subst completely rather than converting to {vt=N}.
---
 .../Debian/PkgKde/SymbolsHelper/Symbol.pm          |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
index c451db0..1588487 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -95,8 +95,24 @@ sub initialize {
 	} else {
 	    $self->{symbol_templ} = $self->{symbol};
 	}
-	if ($self->expand_substitutions(%opts) > 0) {
-	    $self->add_tag('subst', 'compat');
+	my @substs = $self->expand_substitutions(%opts);
+
+	my $templ = $self->get_symboltempl();
+	my $vt = 0;
+	foreach my $subst (@substs) {
+	    # Drop obsolete vt subst completely
+	    if ($subst =~ /^vt=/) {
+		$templ =~ s/\Q{$subst}\E/$self->{substs}{$subst}/g;
+		$vt++;
+	    }
+	}
+	$self->set_symbolname(undef, $templ) if $vt > 0;
+	if ($vt < scalar(@substs)) {
+	    if ($vt) {
+		$self->add_tag('subst', 'compat-no-vt');
+	    } else {
+		$self->add_tag('subst', 'compat');
+	    }
 	}
     }
 

-- 
Debian Qt/KDE packaging tools