Merge version 1.12.1+dfsg-3+rpi1 and 1.12.1+dfsg-4 to produce 1.12.1+dfsg-4+rpi1

diff --cc debian/changelog
index 75b1b91e33b84981ebd3bdc06a2d47ec97605cdf,d2dd3b29406ff6e7c83d5cbe43b0a3cc8608ef3b..7b682a110a1f6464d51d2916ef3b525520102e57
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- pcl (1.12.1+dfsg-3+rpi1) bookworm-staging; urgency=medium
++pcl (1.12.1+dfsg-4+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.12.1+dfsg-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 03 Feb 2022 18:00:06 +0000]
 +  * Build with clang 11 to avoid armv7 contamination.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 18:00:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 16:56:47 +0000
++
+ pcl (1.12.1+dfsg-4) unstable; urgency=medium
+ 
+   * Add upstream source
+   * Temporary add depends for #1013316
+   * Bump policy version (no changes)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Wed, 13 Jul 2022 15:20:25 +0200
  
  pcl (1.12.1+dfsg-3) unstable; urgency=medium
  

diff --cc debian/control
index 3d5e0fc8a7f4a8e67604a1eb17e9fbebf085dca8,a6726e534f1b7e5d75a89f4df91385ded72a3820..da3dadae39e204efb0d977a1638769592a97e1d9
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,7 -6,8 +6,8 @@@ Section: lib
  Priority: optional
  Build-Depends: debhelper-compat (= 13),
                 cmake,
 -             clang [mipsel armel armhf],
+              libstdc++-12-dev [mipsel armel armhf],
 +             clang-11 [mipsel armel armhf],
               python3-sphinx,
               libboost-system-dev,
               libboost-filesystem-dev,