[SCM] openni-sensor-primesense/master: Add fix to handle ppc64 and ppc64el architectures

[jspricke at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 36a7e47037c0e65bd8dcd0f90a94265d81948d4a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 26 14:54:29 2017 +0200

    Add fix to handle ppc64 and ppc64el architectures
    
    Closes: #875796
    Thanks: Frédéric Bonnard

diff --git a/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch b/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
index 5c0fbaa..d259884 100644
--- a/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
+++ b/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
@@ -1,6 +1,7 @@
 From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
 Date: Mon, 11 May 2015 15:48:01 +0200
-Subject: Add support for Powerpc (Thanks to Roland Stigge)
+Subject: =?utf-8?q?Add_support_for_Powerpc_=28Thanks_to_Roland_Stigge_and_?=
+ =?utf-8?q?Fr=C3=A9d=C3=A9ric_Bonnard=29?=
 
 ---
  Platform/Linux/Build/Common/CommonDefs.mak   | 2 ++
@@ -41,14 +42,14 @@ index 0000000..8fe48e5
 +
 +endif
 diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index 4d58a30..14fc068 100644
+index 4d58a30..e2f3398 100644
 --- a/Platform/Linux/CreateRedist/RedistMaker
 +++ b/Platform/Linux/CreateRedist/RedistMaker
 @@ -29,6 +29,8 @@ else
  		PLATFORM="x64" ;;
  	arm)
  		PLATFORM="Arm" ;;
-+	ppc)
++	ppc*)
 +		PLATFORM="Powerpc" ;;
  	*)
  		echo "Unknown machine type: $MACHINE_TYPE"
diff --git a/debian/patches/0010-Add-ARMhf-support.patch b/debian/patches/0010-Add-ARMhf-support.patch
index a0276f4..c19e866 100644
--- a/debian/patches/0010-Add-ARMhf-support.patch
+++ b/debian/patches/0010-Add-ARMhf-support.patch
@@ -21,12 +21,12 @@ index 32cc34d..ecc5540 100644
      # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
      CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
 diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index 14fc068..d0530db 100644
+index e2f3398..034cfbb 100644
 --- a/Platform/Linux/CreateRedist/RedistMaker
 +++ b/Platform/Linux/CreateRedist/RedistMaker
 @@ -31,6 +31,8 @@ else
  		PLATFORM="Arm" ;;
- 	ppc)
+ 	ppc*)
  		PLATFORM="Powerpc" ;;
 +	arm*)
 +		PLATFORM="Arm" ;;
diff --git a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
index 921e924..ec2e985 100644
--- a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
+++ b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
@@ -41,7 +41,7 @@ index 0000000..7a1f193
 +
 +endif
 diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index d0530db..ea5c427 100644
+index 034cfbb..7400636 100644
 --- a/Platform/Linux/CreateRedist/RedistMaker
 +++ b/Platform/Linux/CreateRedist/RedistMaker
 @@ -29,6 +29,8 @@ else
@@ -50,7 +50,7 @@ index d0530db..ea5c427 100644
  		PLATFORM="Arm" ;;
 +	aarch64)
 +		PLATFORM="AArch64" ;;
- 	ppc)
+ 	ppc*)
  		PLATFORM="Powerpc" ;;
  	arm*)
 diff --git a/Source/Utils/XnSensorServer/SensorServer.cpp b/Source/Utils/XnSensorServer/SensorServer.cpp
diff --git a/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch b/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
index bfe3b44..21abe95 100644
--- a/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
+++ b/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
@@ -41,7 +41,7 @@ index 0000000..8fe48e5
 +
 +endif
 diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index ea5c427..919fb48 100644
+index 7400636..898009b 100644
 --- a/Platform/Linux/CreateRedist/RedistMaker
 +++ b/Platform/Linux/CreateRedist/RedistMaker
 @@ -35,6 +35,8 @@ else
diff --git a/debian/patches/0013-Reproducible-builds.patch b/debian/patches/0013-Reproducible-builds.patch
index d7151a6..91938c7 100644
--- a/debian/patches/0013-Reproducible-builds.patch
+++ b/debian/patches/0013-Reproducible-builds.patch
@@ -1,9 +1,16 @@
-Author: Reiner Herrmann <reiner at reiner-h.de>
-Description: Sort list of source files for deterministic linking order
+From: Reiner Herrmann <reiner at reiner-h.de>
+Date: Tue, 26 Sep 2017 14:50:38 +0200
+Subject: Sort list of source files for deterministic linking order
 
+---
+ Platform/Linux/Build/Common/CommonDefs.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Platform/Linux/Build/Common/CommonDefs.mak b/Platform/Linux/Build/Common/CommonDefs.mak
+index 5f9e832..5e5c74f 100644
 --- a/Platform/Linux/Build/Common/CommonDefs.mak
 +++ b/Platform/Linux/Build/Common/CommonDefs.mak
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ else
  endif
  
  # expand file list

-- 
openni-sensor-primesense packaging