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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d43529cc59d1527799f43be945aaebbd13a90090
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Oct 3 19:01:14 2013 -0300

    s390 uses unsigned int for quintptr.
---
 debian/changelog                                        |    3 +++
 perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 60dcfd8..d0910d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pkg-kde-tools (0.15.10) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Actually s390 uses 'j' (unsigned int) for quintptr (Closes: #725300).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Oct 2013 17:57:25 -0300
 
 pkg-kde-tools (0.15.9) unstable; urgency=low
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index fecac3c..8f00635 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -256,7 +256,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390|s390x|sparc64|ppc64/) ? 'y' : 'j';
+    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64/) ? 'y' : 'j';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;

-- 
Debian Qt/KDE packaging tools