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

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed Oct 2 20:25:35 UTC 2013


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

The following commit has been merged in the master branch:
commit 51c5b09d96191a4e539c6ab31f98f1d178d982a1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 2 17:24:58 2013 -0300

    Add s390 and s390x to the list of archs that use 'y' for quintptr.
    
    Closes: #725023.
---
 debian/changelog                                        |    4 ++++
 perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 51b9c08..863098f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 pkg-kde-tools (0.15.9) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add s390 and s390x to the list of archs that use 'y' (unsigned long long)
+    as replacement for quintptr (Closes: #725023).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 30 Sep 2013 22:48:50 -0300
 
 pkg-kde-tools (0.15.8) unstable; urgency=low
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index d11e52f..fecac3c 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|sparc64|ppc64/) ? 'y' : 'j';
+    return ($arch =~ /amd64|ia64|alpha|s390|s390x|sparc64|ppc64/) ? 'y' : 'j';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list