diff -Nru openni2-2.2.0.33+dfsg/debian/changelog openni2-2.2.0.33+dfsg/debian/changelog
--- openni2-2.2.0.33+dfsg/debian/changelog	2018-05-05 15:40:24.000000000 +0000
+++ openni2-2.2.0.33+dfsg/debian/changelog	2018-05-15 06:49:20.000000000 +0000
@@ -1,3 +1,10 @@
+openni2 (2.2.0.33+dfsg-11+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>  Tue, 15 May 2018 06:49:20 +0000
+
 openni2 (2.2.0.33+dfsg-11) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru openni2-2.2.0.33+dfsg/debian/patches/auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265 openni2-2.2.0.33+dfsg/debian/patches/auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265
--- openni2-2.2.0.33+dfsg/debian/patches/auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265	1970-01-01 00:00:00.000000000 +0000
+++ openni2-2.2.0.33+dfsg/debian/patches/auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265	2018-05-15 06:49:20.000000000 +0000
@@ -0,0 +1,75 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Subject: Automatically generated patch (2.2.0.33+dfsg-10+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit 5e23fdcb08db0ec628fffa42b44116ff344bb22e
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Thu Sep 28 00:06:53 2017 +0000
+
+    Remove old raspbian patch that no longer applies, dgit will generate a new one.
+
+commit c3dde68640b7ec709868df402d7516bd3e4d88aa
+Merge: be1551c 2f61873
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Thu Sep 28 00:03:13 2017 +0000
+
+    Manual merge of version 2.2.0.33+dfsg-9+rpi1 and 2.2.0.33+dfsg-10 to produce 2.2.0.33+dfsg-10+rpi1
+
+commit 2f61873f0b0daf0e6e9e0668f108254d563debc9
+Merge: a93e7eb bc15b1b
+Author: Jochen Sprickerhof <jspricke@debian.org>
+Date:   Sat Sep 9 15:17:46 2017 +0100
+
+    Merge openni2 (2.2.0.33+dfsg-10) import into refs/heads/workingbranch
+---
+
+--- openni2-2.2.0.33+dfsg.orig/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
++++ openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
+@@ -6,21 +6,21 @@ ifndef CFG
+     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
+-	HOST_PLATFORM = generic
+-endif
++#else
++#	HOST_PLATFORM = generic
++#endif
+ 
+ # now check if this is a cross-compilation or not
+ ifeq "$(PLATFORM)" ""
+--- openni2-2.2.0.33+dfsg.orig/ThirdParty/PSCommon/BuildSystem/Platform.Arm
++++ openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/Platform.Arm
+@@ -4,7 +4,7 @@ export GLUT_SUPPORTED=1
+ ifeq "$(CFG)" "Release"
+ 
+     # Hardware specifying flags
+-    CFLAGS += -Wno-unused-local-typedefs -march=armv7-a -mtune=cortex-a9 -mfpu=neon #-mfloat-abi=softfp #-mcpu=cortex-a8
++    CFLAGS += -Wno-unused-local-typedefs #-march=armv7-a #-mtune=cortex-a9 #-mfpu=neon #-mfloat-abi=softfp #-mcpu=cortex-a8
+ 
+     # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
+     CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
diff -Nru openni2-2.2.0.33+dfsg/debian/patches/series openni2-2.2.0.33+dfsg/debian/patches/series
--- openni2-2.2.0.33+dfsg/debian/patches/series	2018-05-05 15:18:15.000000000 +0000
+++ openni2-2.2.0.33+dfsg/debian/patches/series	2018-05-15 06:49:20.000000000 +0000
@@ -14,3 +14,4 @@
 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
+auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265