[SCM] gammaray packaging branch, master, updated. debian/2.1.0-3-7-gd510475

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=0eff3cb

The following commit has been merged in the master branch:
commit 0eff3cb7c8e4ed51fa3ab21d64ba2fa1633198d0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 12 20:59:25 2014 +0100

    Import changes from NMU 2.1.0-3.1
---
 debian/changelog                            | 8 ++++++++
 debian/patches/debian-archs-fix-build.patch | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1e5d8a8..bed377b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gammaray (2.1.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on mips64(el), as on mips* platform, they use the same
+    e_machine value (Closes: #761805).
+
+ -- YunQiang Su <syq at debian.org>  Thu, 09 Oct 2014 13:24:02 +0800
+
 gammaray (2.1.0-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/debian-archs-fix-build.patch b/debian/patches/debian-archs-fix-build.patch
index 1cd1914..667b70f 100644
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@ -37,7 +37,7 @@ index e8519e9..5da6dee 100644
    # uname reports different ARM versions, unlike ELF, so map all this to "arm"
    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
      set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-arm")
-+  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
++  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
 +    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-mips")
 +  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64el")
 +    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-ppc64")

-- 
gammaray packaging