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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit aa9c7904260d9a9531f08cebbcc8931935e486b9
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 31 14:59:35 2010 +0200

    Add detection/expansion support for quintptr/qptrdiff.
---
 debian/changelog                                   |    2 +
 .../Debian/PkgKde/SymbolsHelper/Substs.pm          |    2 +
 .../PkgKde/SymbolsHelper/Substs/TypeSubst.pm       |   38 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 700826b..80be1ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ pkg-kde-tools (0.6.0~rc2) UNRELEASED; urgency=low
     multiple patches) at the same time. All revelevant information is
     kept/merged, arch tags are managed automatically whenever possible.
     Incremental patching is also supported.
+  * Add support for detection/expansion of the qprtdiff and quintptr substs (Qt
+    types).
 
  -- Modestas Vainius <modestas at vainius.eu>  Sun, 06 Dec 2009 22:06:01 +0200
 
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm
index 1738bc5..eed306f 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm
@@ -34,6 +34,8 @@ our @TYPE_SUBSTS = (
     "${NS}::TypeSubst::ssize_t"->new(),
     "${NS}::TypeSubst::int64_t"->new(),
     "${NS}::TypeSubst::uint64_t"->new(),
+    "${NS}::TypeSubst::qptrdiff"->new(),
+    "${NS}::TypeSubst::quintptr"->new(),
     "${NS}::TypeSubst::qreal"->new(),
 );
 
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index 310a596..2028b9a 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -339,6 +339,44 @@ sub _expand {
     return ($arch =~ /amd64|ia64|alpha/) ? 'm' : 'y';
 }
 
+package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;
+
+use strict;
+use warnings;
+use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
+
+sub new {
+    my $class = shift;
+    my $self = $class->SUPER::new(@_);
+    $self->{substvar} = "{qptrdiff}";
+    $self->{types} = [ qw(x i) ]; # long long / int
+    return $self;
+}
+
+sub _expand {
+    my ($self, $arch) = @_;
+    return ($arch =~ /amd64|ia64|alpha/) ? 'x' : 'i';
+}
+
+package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;
+
+use strict;
+use warnings;
+use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
+
+sub new {
+    my $class = shift;
+    my $self = $class->SUPER::new(@_);
+    $self->{substvar} = "{quintptr}";
+    $self->{types} = [ qw(y j) ]; # unsigned long long / unsigned int
+    return $self;
+}
+
+sub _expand {
+    my ($self, $arch) = @_;
+    return ($arch =~ /amd64|ia64|alpha/) ? 'y' : 'j';
+}
+
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qreal;
 
 use strict;

-- 
Debian Qt/KDE packaging tools