Merge version 2.2.0.33+dfsg-14+rpi1 and 2.2.0.33+dfsg-15 to produce 2.2.0.33+dfsg...

diff --cc debian/changelog
index 0067299d6801ac43d54e229fd9873eea45842623,d8ffa02fcf53c74d6feafdb9dec8ac04ed251153..7983ab8e7203e679fdf8064ce1e97beb124a8984
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- openni2 (2.2.0.33+dfsg-14+rpi1) bullseye-staging; urgency=medium
++openni2 (2.2.0.33+dfsg-15+rpi1) bullseye-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>  Thu, 10 Dec 2020 09:46:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Feb 2021 19:24:31 +0000
++
+ openni2 (2.2.0.33+dfsg-15) unstable; urgency=medium
+ 
+   * Add patch for Java 17 (Closes: #982019)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 05 Feb 2021 20:15:35 +0100
  
  openni2 (2.2.0.33+dfsg-14) unstable; urgency=medium
  

diff --cc debian/patches/series
index f37e2869a2e090c9ecb768cce8ef53d7a2cbf4e0,dba740be2f3d7163ff983cb81ab93a32945653c1..055a3b062b4c36ec5e0143d26eded9e4dc20404a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -15,4 -15,4 +15,5 @@@
  0016-Use-the-generic-platform-for-armel-armhf-NEON-is-not.patch
  0017-Port-to-Python-3.patch
  0018-Don-t-allocate-m_errorBuffer-on-TLS.patch
+ 0018-Fix-javadoc-with-Java-17.patch
 +auto-2.2.0.33+dfsg-10+rpi1-5e23fdcb08db0ec628fffa42b44116ff344bb22e-1506557265