From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 3 Jun 2023 03:05:01 +0000 (+0100)
Subject: Merge version 4.6.0+dfsg-11+rpi1 and 4.6.0+dfsg-12 to produce 4.6.0+dfsg-12+rpi1
X-Git-Tag: archive/raspbian/4.6.0+dfsg-12+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41c44e944dfc3bcc4f763f0aedc002774ace5a93;p=opencv.git

Merge version 4.6.0+dfsg-11+rpi1 and 4.6.0+dfsg-12 to produce 4.6.0+dfsg-12+rpi1
---

41c44e944dfc3bcc4f763f0aedc002774ace5a93
diff --cc debian/changelog
index 4397070,6ddf7e4..9a57a1b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- opencv (4.6.0+dfsg-11+rpi1) bookworm-staging; urgency=medium
++opencv (4.6.0+dfsg-12+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>  Mon, 13 Mar 2023 21:49:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 03:05:01 +0000
++
+ opencv (4.6.0+dfsg-12) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Andreas Beckmann ]
+   * libopencv-core406: Add Breaks: libopencv-core4.5 for smoother upgrades from bullseye
+     (Closes: #1035886)
+ 
+   [ Jochen Sprickerhof ]
+   * Add upstream patches for CVE-2023-2617 and CVE-2023-2618 (Closes: #1035954)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 12 May 2023 11:40:38 +0200
  
  opencv (4.6.0+dfsg-11) unstable; urgency=medium