[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.0-2-g75d8c43

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 75d8c43ed4181efa60f381f386a4e349622e9ef6
Author: Modestas Vainius <modax at debian.org>
Date:   Mon May 30 00:01:14 2011 +0300

    Do not replace substs unless the symbol is tagged with subst tag.
    
    pkgkde-symbolshelper: no longer replace substs in the symbol name unless the
    symbol is tagged with a 'subst' tag. This was kept for compatibility with <<
    0.6 symbol files.
---
 debian/changelog                              |    3 ++
 perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm |   30 -------------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c78de7..5d0581f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pkg-kde-tools (0.14.1) UNRELEASED; urgency=low
 
+  * pkgkde-symbolshelper: no longer replace substs in the symbol name unless
+    the symbol is tagged with a 'subst' tag. This was kept for compatibility
+    with << 0.6 symbol files.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 29 May 2011 23:57:00 +0300
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
index 1588487..c1b91b8 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -86,36 +86,6 @@ sub initialize {
 	}
     }
 
-    # NOTE: backwards compatibility with pkgkde-symbolshelper (<< 0.6)
-    # symbol files.
-    if ($self->get_symbolname() =~ /\{.+\}/) {
-	$self->{symbol} =~ s/\{vt:/{vt=/g;
-	if (defined $self->{symbol_templ}) {
-	    $self->{symbol_templ} =~ s/\{vt:/{vt=/g;
-	} else {
-	    $self->{symbol_templ} = $self->{symbol};
-	}
-	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');
-	    }
-	}
-    }
-
     return $self->SUPER::initialize(%opts);
 }
 

-- 
Debian Qt/KDE packaging tools