[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=8497b5e

The following commit has been merged in the master branch:
commit 8497b5e8ba05bf7205ab85b4a717e18f90c05a9a
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 2 21:43:16 2012 +0300

    Refactor trunk symbol checking into its own sub.
    
    Remove Symbol::is_vtt() since it is not used.
---
 perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
index efe158a..a400849 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -69,8 +69,15 @@ sub get_substs {
     return $self->{substs};
 }
 
-sub is_vtt {
-    return shift()->get_symbolname() =~ /^_ZT[VT]/;
+sub is_trunk_symbol {
+    my $self = shift;
+    my $name = shift || $self->get_symbolname();
+    # Based on: binutils/libiberty/cp-demangle.c:d_special_name()
+    # c - DEMANGLE_COMPONENT_COVARIANT_THUNK: covariant return thunk to
+    # C - DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: construction vtable for
+    # h - DEMANGLE_COMPONENT_THUNK: non-virtual thunk to
+    # v - DEMANGLE_COMPONENT_VIRTUAL_THUNK: virtual thunk to
+    return $name =~ /^_ZT[Cchv]/;
 }
 
 sub initialize {
@@ -305,12 +312,7 @@ sub convert_templ_to_cpp_alias {
 
 sub upgrade_virtual_table_symbol {
     my ($self, $arch) = @_;
-    # Based on: binutils/libiberty/cp-demangle.c:d_special_name()
-    # c - DEMANGLE_COMPONENT_COVARIANT_THUNK: covariant return thunk to
-    # C - DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: construction vtable for
-    # h - DEMANGLE_COMPONENT_THUNK: non-virtual thunk to
-    # v - DEMANGLE_COMPONENT_VIRTUAL_THUNK: virtual thunk to
-    if ($self->get_symboltempl() =~ /^_ZT[Cchv]/) {
+    if ($self->is_trunk_symbol($self->get_symboltempl())) {
 	my $newtempl = $self->convert_templ_to_cpp_alias();
 	if (defined $newtempl) {
 	    $self->set_symbolname($newtempl, $newtempl);

-- 
Debian Qt/KDE packaging tools