Manual merge of version 2.2.0.33+dfsg-9+rpi1 and 2.2.0.33+dfsg-10 to produce 2.2...

diff --cc ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
index 71e2b5dedbed6bb395b308aa271bafc3b0306f1e,6384ef861c9ddd74740022d5533ae49b1a5bc4b9..f08c6aa6de2eb80ce0bdcddcb6a15219656dd356
--- 1/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
--- 2/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
+++ b/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
@@@ -6,23 -6,21 +6,21 @@@ ifndef CF
      CFG = Release
  endif
  
 -# find out the platform on which we're running
 -MACHINE = $(shell uname -m)
 -ifneq (,$(findstring x86_64,$(MACHINE)))
 -      HOST_PLATFORM = x64
 -else ifneq (,$(findstring x86,$(MACHINE)))
 -      HOST_PLATFORM = x86
 -else ifneq (,$(findstring i686,$(MACHINE)))
 -      HOST_PLATFORM = x86
 -else ifneq (,$(findstring i386,$(MACHINE)))
 -      HOST_PLATFORM = x86
 -else ifneq (,$(findstring armv6l,$(MACHINE)))
 +## find out the platform on which we're running
 +#MACHINE = $(shell uname -m)
 +#ifneq (,$(findstring x86_64,$(MACHINE)))
 +#     HOST_PLATFORM = x64
 +#else ifneq (,$(findstring x86,$(MACHINE)))
 +#     HOST_PLATFORM = x86
 +#else ifneq (,$(findstring i686,$(MACHINE)))
 +#     HOST_PLATFORM = x86
 +#else ifneq (,$(findstring i386,$(MACHINE)))
 +#     HOST_PLATFORM = x86
 +#else ifneq (,$(findstring armv6l,$(MACHINE)))
        HOST_PLATFORM = Armv6l
- #else ifneq (,$(findstring arm,$(MACHINE)))
- #     HOST_PLATFORM = Arm
 -else
 -      HOST_PLATFORM = generic
 -endif
 +#else
 +#     HOST_PLATFORM = generic
 +#endif
  
  # now check if this is a cross-compilation or not
  ifeq "$(PLATFORM)" ""

diff --cc debian/changelog
index ab8ba408d42fd7489c00b8e4ee95ee9786bc7748,db8d2ed1001259f75e96ab68645704b2aae1945d..922b865d3966cb48d918a53c544cd71d3573770c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- openni2 (2.2.0.33+dfsg-9+rpi1) buster-staging; urgency=medium
++openni2 (2.2.0.33+dfsg-10+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.2.0.33+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 12 Sep 2016 22:39:36 +0000]
 +  * Force PSCommon platform to armv6l
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Aug 2017 17:42:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Sep 2017 00:02:30 +0000
++
+ openni2 (2.2.0.33+dfsg-10) unstable; urgency=medium
+ 
+   * Add patch for arm.
+     Thanks to Adrian Bunk (Closes: #874220)
+   * Remove flags, not needed anymore
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 09 Sep 2017 16:17:46 +0200
  
  openni2 (2.2.0.33+dfsg-9) unstable; urgency=medium
  

diff --cc debian/patches/series
index 34944a6f0da5350779f80e318c35e7285197f6e7,17c1a0ff5add745eb38ed5c5efc74e7f67adb093..8636d11ae506b4d707a6be58c5ba709d371c8b93
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -13,4 -13,4 +13,5 @@@
  0013-Fix-GCC6-compilation.patch
  0014-fix-format-overflow-for-GCC7.patch
  0015-Initialize-variable-for-gcc7.patch
+ 0016-Use-the-generic-platform-for-armel-armhf-NEON-is-not.patch
 +9999-raspbian.patch