Bug#744173: pkg-kde-tools: add arm64 support to SymbolsHelper

[Wookey <wookey@wookware.org>]

Package: pkg-kde-tools
Version: 0.15.13
Severity: important
Tags: patch
User: debian-arm@lists.debian.org
Usertag: arm64

SymbolsHelper needs to know about the new 64-bit architecture arm64 in
order for any package that uses the (subst) Symbols file functionality
to be buildable. This patch fixes that.

This patch is very dim. I feel that one should be able to at least
move this test into one place instead of having 6 instances to
update. But I started messing with that and it simply made me forget to
file at least this basic, working verison.

Would it not be possible to use dpkg-architecture DEB_HOST_ARCH_BITS
to get a generic test? If it doesn't need to work in non-debian
situations that seems like a good solution?

-- System Information:
Debian Release: 7.4
  APT prefers stable
  APT policy: (990, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-kvm-i386-20110111 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

diff -Nru pkg-kde-tools-0.15.13/debian/changelog pkg-kde-tools-0.15.13+arm64/debian/changelog
--- pkg-kde-tools-0.15.13/debian/changelog	2014-02-23 12:09:30.000000000 +0000
+++ pkg-kde-tools-0.15.13+arm64/debian/changelog	2014-04-06 01:44:56.000000000 +0000
@@ -1,3 +1,10 @@
+pkg-kde-tools (0.15.13+arm64) unreleased; urgency=low
+
+  * Non-maintainer upload.
+  * Add arm64 and ppc64el (and armel/armhf) support to SymbolsHelper substitutions
+
+ -- Wookey <wookey@wookware.org>  Sun, 06 Apr 2014 01:31:56 +0000
+
 pkg-kde-tools (0.15.13) unstable; urgency=medium
 
   [ Maximiliano Curia ]
diff -Nru pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm pkg-kde-tools-0.15.13+arm64/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
--- pkg-kde-tools-0.15.13/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm	2014-02-23 12:09:30.000000000 +0000
+++ pkg-kde-tools-0.15.13+arm64/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm	2014-04-06 01:42:19.000000000 +0000
@@ -161,7 +161,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/) ? "m" : "j";
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? "m" : "j";
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::ssize_t;
@@ -180,7 +180,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390|sparc64|ppc64|mips64|mips64el/) ? 'l' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::int64_t;
@@ -199,7 +199,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'l' : 'x';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'x';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::uint64_t;
@@ -218,7 +218,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'm' : 'y';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'm' : 'y';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;
@@ -237,7 +237,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'x' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'x' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;
@@ -256,7 +256,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'y' : 'j';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'y' : 'j';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;
@@ -275,7 +275,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /amd64|ia64|alpha|s390x|sparc64|ppc64|mips64|mips64el/) ? 'l' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qreal;
@@ -294,7 +294,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /(arm|sh4)/) ? 'f' : 'd';
+    return ($arch =~ /(arm|armel|armhf|sh4)/) ? 'f' : 'd';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst;