[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=515b076

The following commit has been merged in the master branch:
commit 515b076c41fdb2253b304338fb6ab0d7c1211287
Merge: 515aa89173d1c5e0a437fa326c56078f570d10eb 0eff3cb7c8e4ed51fa3ab21d64ba2fa1633198d0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 12 21:01:36 2014 +0100

    Merge branch 'nmu'

 debian/changelog                            | 8 ++++++++
 debian/patches/debian-archs-fix-build.patch | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 70e8445,bed377b..3bf7fc8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
 +gammaray (2.1.0-4) UNRELEASED; urgency=medium
 +
 +  * Fix FTBFS on ppc64el.
 +  * Let xvfb-run choose a free server number so it doesn't fail when one is
 +    already taken.
 +
 + -- Felix Geyer <fgeyer at debian.org>  Mon, 28 Jul 2014 19:27:29 +0200
 +
+ 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 --cc debian/patches/debian-archs-fix-build.patch
index d7ab036,667b70f..dee2598
--- a/debian/patches/debian-archs-fix-build.patch
+++ b/debian/patches/debian-archs-fix-build.patch
@@@ -37,9 -37,9 +37,9 @@@ index e8519e9..5da6dee 10064
     # 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")
 ++  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
  +    set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-ppc64")
     else()
       set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-${CMAKE_SYSTEM_PROCESSOR}")

-- 
gammaray packaging