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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 10492b47476af16bf20533b1aa0cc44cf81e38fa
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 4 13:49:14 2011 +0300

    pkgkde-symbolshelper: drop VirtTable subst.
    
    It was deprecated long ago.
---
 debian/changelog                                   |    1 +
 perllib/Debian/PkgKde/SymbolsHelper/Substs.pm      |    2 -
 .../PkgKde/SymbolsHelper/Substs/VirtTable.pm       |  112 --------------------
 3 files changed, 1 insertions(+), 114 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b2a4d8..991720e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pkg-kde-tools (0.14.1) UNRELEASED; urgency=low
     with << 0.6 symbol files.
   * Drop overriden_command alias from dhmk.mk. Most packages should have
     already been transitioned to correct spelling.
+  * pkgkde-symbolshelper: drop VirtTable subst which was deprecated long ago.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 29 May 2011 23:57:00 +0300
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
index eed306f..0188e09 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
@@ -17,7 +17,6 @@ package Debian::PkgKde::SymbolsHelper::Substs;
 
 use strict;
 use warnings;
-use Debian::PkgKde::SymbolsHelper::Substs::VirtTable;
 use Debian::PkgKde::SymbolsHelper::Substs::TypeSubst;
 use base 'Exporter';
 
@@ -26,7 +25,6 @@ our @EXPORT = qw(%SUBSTS @SUBSTS @STANDALONE_SUBSTS @TYPE_SUBSTS @CPP_TYPE_SUBST
 my $NS = 'Debian::PkgKde::SymbolsHelper::Substs';
 
 our @STANDALONE_SUBSTS = (
-    "${NS}::VirtTable"->new(),
 );
 
 our @TYPE_SUBSTS = (
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm
deleted file mode 100644
index 4cb0d61..0000000
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2008-2010 Modestas Vainius <modax at debian.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-
-package Debian::PkgKde::SymbolsHelper::Substs::VirtTable;
-
-use strict;
-use warnings;
-use base 'Debian::PkgKde::SymbolsHelper::Subst';
-
-use Dpkg::ErrorHandling;
-use Dpkg::Shlibs::Cppfilt;
-
-# Expand support (for backwards compatibility)
-# Neutralize support
-
-sub get_name {
-    "vt";
-}
-
-sub _expand {
-    my ($self, $arch, $value) = @_;
-
-    # Mult should be 1 on 32bit arches and 2 on 64bit arches
-    my $mult = ($arch =~ /amd64|ia64|alpha/) ? 2 : 1;
-    return $mult * $value;
-}
-
-sub subvt {
-    my ($self, $rawname, $number, $stroffset) = @_;
-    $rawname->substr($stroffset, length("$number"), "0",
-	($self->{__detect__}) ? $number : undef);
-    return 1;
-}
-
-sub find_ztc_offset {
-    my ($self, $rawname) = @_;
-    $rawname = "$rawname";
-
-    # The idea behind the algorithm is that c++filt output does not
-    # change when offset is changed.
-    # e.g. _ZTCN6KParts15DockMainWindow3E56_NS_8PartBaseE
-
-    my @matches = ($rawname =~ m/(\d+)_/gc);
-    if (!@matches) {
-	error("Invalid construction table symbol: $rawname");
-    } elsif (@matches == 1) {
-	# Found it
-	return (pos($rawname) - length($1) - 1, $1);
-    } else {
-	# The idea behind the algorithm is that c++filt output does not
-	# change when an offset is changed.
-	$rawname =~ s/@[^@]+$//;
-	my $demangled = cppfilt_demangle_cpp($rawname, 'auto');
-	pos($rawname) = undef;
-	while ($rawname =~ m/(\d+)_/g) {
-	    my $offset = $1;
-	    my $pos = pos($rawname) - length($offset) - 1;
-	    my $newsymbol = $rawname;
-	    substr($newsymbol, $pos, length($offset)) = $offset + 1234;
-	    my $newdemangled = cppfilt_demangle_cpp($newsymbol, 'auto');
-	    return ($pos, $offset) if (defined $newdemangled && $newdemangled eq $demangled);
-	}
-	error("Unable to determine construction table offset position in symbol '$rawname'");
-    }
-}
-
-sub neutralize {
-    my ($self, $rawname) = @_;
-    my $ret = 1;
-
-    # construction vtable: e.g. _ZTCN6KParts15DockMainWindow3E56_NS_8PartBaseE
-    if ($rawname =~ /^_ZTC/) {
-	my ($pos, $num) = $self->find_ztc_offset($rawname);
-	$ret = $self->subvt($rawname, $num, $pos) if ($num > 0);
-    } elsif ($rawname =~ /^_ZThn(\d+)_/) {
-	# non-virtual base override: e.g. _ZThn8_N6KParts13ReadWritePartD0Ev
-	my $num = $1;
-	$ret = $self->subvt($rawname, $num, 5) if ($num > 0);
-    } elsif ($rawname =~ /^_ZTvn?(\d+)_(n?\d+)/) {
-	# virtual base override, with vcall offset, e.g. _ZTv0_n12_N6KParts6PluginD0Ev
-	my $voffset = $1;
-	my $num = $2;
-	my $numoffset = 4 + length("$voffset") + 1 + (($num =~ /^n/) ? 1 : 0);
-	$num =~ s/^n//;
-
-	$ret = $self->subvt($rawname, $voffset, 4) if ($voffset > 0);
-	$ret = $self->subvt($rawname, $num, $numoffset) || $ret if ($num > 0);
-    }
-    return ($ret) ? $rawname : undef;
-}
-
-sub detect {
-    my $self = shift;
-    $self->{__detect__} = 1;
-    my $ret = $self->neutralize(@_);
-    delete $self->{__detect__};
-    return $ret;
-}
-
-1;

-- 
Debian Qt/KDE packaging tools