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

[Pino Toscano]

The following commit has been merged in the master branch:
commit 7db23b186740d0e587aa1f72e9eccd619a4f2313
Author: Pino Toscano <pino at debian.org>
Date:   Mon Dec 26 11:19:12 2011 +0100

    pkgkde-symbolshelper: fix the int64_t and uint64_t expansions on s390x
---
 debian/changelog                                   |    3 +++
 .../PkgKde/SymbolsHelper/Substs/TypeSubst.pm       |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0d4a9a..2007c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ pkg-kde-tools (0.14.3) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Add check-not-installed target.
 
+  [ Pino Toscano ]
+  * pkgkde-symbolshelper: fix the int64_t and uint64_t expansions on s390x.
+
  -- Modestas Vainius <modax at debian.org>  Thu, 21 Jul 2011 16:16:36 +0300
 
 pkg-kde-tools (0.14.2) unstable; urgency=low
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index 7e0d0d8..bbebcc1 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -199,7 +199,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha/) ? 'l' : 'x';
+    return ($arch =~ /amd64|ia64|alpha|s390x/) ? 'l' : 'x';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::uint64_t;
@@ -218,7 +218,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha/) ? 'm' : 'y';
+    return ($arch =~ /amd64|ia64|alpha|s390x/) ? 'm' : 'y';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;

-- 
Debian Qt/KDE packaging tools