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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit da3e4f2b75d85d8f3969e8fe3cd20a8ed39b9c79
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jan 30 13:09:47 2010 +0200

    Fix a bug in String::init_string2_by_re().
---
 .../Debian/PkgKde/SymbolsHelper/String.pm          |    2 +-
 .../Debian/PkgKde/SymbolsHelper/Symbol.pm          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm
index 109521a..7800938 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm
@@ -33,7 +33,7 @@ sub init_string2_by_re {
 	my $key = $1;
 	my $i = pos($str2) - length($&) - $offset;
 	$str2[$i] = "$&";
-	my $count = $i + length($values->{$key})-1;
+	my $count = $i + length($values->{$key});
 	for ($i++; $i < $count; $i++) {
 	    $str2[$i] = undef;
 	}
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
index 1f1ec31..c451db0 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -37,9 +37,9 @@ sub get_h_name {
 	    $self->{h_name}->init_string2_by_re($self->get_symboltempl(),
 		qr/\{([^}]+)\}/, $self->{substs});
 	    if ($self->{h_name}->get_string2() ne $self->get_symboltempl()) {
-		internerr("unsupported substitutions/alterations to the the symbol name '%s' " .
-		    "from the symbol template '%s'. Cannot continue.",
-		    $self->get_symbolname(), $self->get_symboltempl());
+		internerr("unsupported substitutions/alterations in the symbol template '%s'. " .
+		    "Parsed as '%s'. Cannot continue.",
+		    $self->get_symboltempl(), $self->{h_name}->get_string2());
 	    }
 	}
     }

-- 
Debian Qt/KDE packaging tools