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

diff --cc debian/changelog
index 83cf79f672b98aa53150fa8c163d24ce5291bf15,f6ab8720e3f80c124e16278c0bc49eb8a7da313d..01e11b10ac418eec6b7b5198d4cc3dce552007d1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- opencv (4.6.0+dfsg-6+rpi1) bookworm-staging; urgency=medium
++opencv (4.6.0+dfsg-7+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Aug 2022 21:48:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 24 Sep 2022 16:18:41 +0000
++
+ opencv (4.6.0+dfsg-7) unstable; urgency=medium
+ 
+   [ Victor Westerhuis ]
+   * Do not try to download any files while building (Closes: 1019519)
+   * Support building by directly calling d/rules
+   * Fix Java architecture test in d/build
+   * Do not build unused statically linked apps and Java bindings
+   * Delete useless Build-Depends on libswresample
+   * Fix building with LAPACK
+   * Build highgui module with QT support (Closes: 958028)
+ 
+   [ Mo Zhou ]
+   * Fix broken symlink for .jar file. (Closes: #1019863)
+ 
+  -- Mo Zhou <lumin@debian.org>  Wed, 21 Sep 2022 20:51:42 -0400
  
  opencv (4.6.0+dfsg-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge