[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.0

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=1f00872

The following commit has been merged in the master branch:
commit 1f00872aef7a98a20ac70658829b0b026f811610
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 2 21:39:02 2012 +0300

    pkgkde-symbolshelper: output covariant return trunks with c++ tag.
    
    Symbol names of covariant return trunks contain an arch-specific offset.
    (Closes: #657806)
---
 debian/changelog                              |    2 ++
 perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8febc50..2be3a88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ pkg-kde-tools (0.15.0~pre2) UNRELEASED; urgency=low
   * Implement pkgkde-git clone and update-config subcommands.
   * Make variables.mk respect LDFLAGS from environment. Thanks to Simon
     Ruderich for the patch. (Closes: #669183)
+  * pkgkde-symbolshelper: output covariant return trunks with c++ tag since the
+    symbol name contains an arch-specific offset. (Closes: #657806)
 
   [ José Manuel Santamaría Lema ]
   * Add a workaround for cmake bug #653916 (cmake ignores CPPFLAGS) in
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
index c1b91b8..4247faf 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -305,7 +305,7 @@ sub convert_templ_to_cpp_alias {
 
 sub upgrade_virtual_table_symbol {
     my ($self, $arch) = @_;
-    if ($self->get_symboltempl() =~ /^_ZT[Chv]/) {
+    if ($self->get_symboltempl() =~ /^_ZT[Cchv]/) {
 	my $newtempl = $self->convert_templ_to_cpp_alias();
 	if (defined $newtempl) {
 	    $self->set_symbolname($newtempl, $newtempl);

-- 
Debian Qt/KDE packaging tools