[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.11-2-g68021be

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 68021be880f44ec996fdda5013a0e3b393884cda
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 18 16:12:31 2013 +0400

    pkgkde-symbolshelper: fix qptrdiff expansion for s390x.
    
    Rebasing 2bef3ff8f04a0770d0ad1245d43da505df6a7791 on top of
    Lisandro’s changes.
---
 debian/changelog                                        | 2 ++
 perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 86db56b..a8b4706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 pkg-kde-tools (0.15.12) unstable; urgency=low
 
+  [ Dmitry Shachnev ]
+  * pkgkde-symbolshelper: fix qptrdiff expansion for s390x.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 18 Dec 2013 16:07:44 +0400
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index 6e3c4c9..4cfe8da 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -237,7 +237,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|sparc64|ppc64|mips64|mips64el/) ? 'x' : 'i';
+    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'x' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;

-- 
Debian Qt/KDE packaging tools