Merge version 4.6.0+dfsg-4+rpi1 and 4.6.0+dfsg-6 to produce 4.6.0+dfsg-6+rpi1

diff --cc debian/changelog
index 87d7d21b5e0d4e5161e993a8cfc8a5e9df17bd31,32aa1a9ca2c7a4e3ae3b14d383d91dddeefdfe80..83cf79f672b98aa53150fa8c163d24ce5291bf15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,25 @@@
- opencv (4.6.0+dfsg-4+rpi1) bookworm-staging; urgency=medium
++opencv (4.6.0+dfsg-6+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 4.6.0+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Jul 2022 00:23:33 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 17 Jul 2022 00:23:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Aug 2022 21:48:14 +0000
++
+ opencv (4.6.0+dfsg-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * Revert "Package ovis module"
+     Needs libogre-1.12-dev which is not available on mipsel
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 09 Aug 2022 09:38:18 +0200
+ 
+ opencv (4.6.0+dfsg-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add patches to fix build (Closes: #1016684)
+   * Package ovis module
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 09 Aug 2022 07:02:57 +0200
  
  opencv (4.6.0+dfsg-4) unstable; urgency=medium