[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.7-1-gbd3ddd5

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit bd3ddd5ae38ee392f10ac7f255676372f14d63b7
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Jun 26 17:55:46 2013 +0200

    pkgkde-symbolshelper: Add intptr_t type substitution.
    
    intptr_t is the same as ssize_t on all supported platforms
    except s390 where it's an int instead of long.
---
 debian/changelog                                    |    7 +++++++
 perllib/Debian/PkgKde/SymbolsHelper/Substs.pm       |    1 +
 .../Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm |   19 +++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bdbfff2..b99fd1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pkg-kde-tools (0.15.8) UNRELEASED; urgency=low
+
+  [ Felix Geyer ]
+  * pkgkde-symbolshelper: Add intptr_t type substitution.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Jun 2013 18:01:25 +0200
+
 pkg-kde-tools (0.15.7) unstable; urgency=low
 
   * pkgkde-vcs: replace support for lenny-backports with wheezy-backports.
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
index 0188e09..4ebe58c 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
@@ -34,6 +34,7 @@ our @TYPE_SUBSTS = (
     "${NS}::TypeSubst::uint64_t"->new(),
     "${NS}::TypeSubst::qptrdiff"->new(),
     "${NS}::TypeSubst::quintptr"->new(),
+    "${NS}::TypeSubst::intptr_t"->new(),
     "${NS}::TypeSubst::qreal"->new(),
 );
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index e2576c3..d11e52f 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -259,6 +259,25 @@ sub _expand {
     return ($arch =~ /amd64|ia64|alpha|sparc64|ppc64/) ? 'y' : 'j';
 }
 
+package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;
+
+use strict;
+use warnings;
+use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
+
+sub new {
+    my $class = shift;
+    my $self = $class->SUPER::new(@_);
+    $self->{substvar} = "{intptr_t}";
+    $self->{types} = [ qw(l i) ]; # long / int
+    return $self;
+}
+
+sub _expand {
+    my ($self, $arch) = @_;
+    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64/) ? 'l' : 'i';
+}
+
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qreal;
 
 use strict;

-- 
Debian Qt/KDE packaging tools