From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 9 Sep 2024 14:18:35 +0000 (+0100)
Subject: Merge version 4.6.0+dfsg-13.1+rpi1 and 4.6.0+dfsg-14 to produce 4.6.0+dfsg-14+rpi1
X-Git-Tag: archive/raspbian/4.6.0+dfsg-14+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b686c5650fba103640d5daec0d3f0927eeb852d;p=opencv.git

Merge version 4.6.0+dfsg-13.1+rpi1 and 4.6.0+dfsg-14 to produce 4.6.0+dfsg-14+rpi1
---

6b686c5650fba103640d5daec0d3f0927eeb852d
diff --cc debian/changelog
index 39006cf,96b20e7..643e93c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- opencv (4.6.0+dfsg-13.1+rpi1) trixie-staging; urgency=medium
++opencv (4.6.0+dfsg-14+rpi1) trixie-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>  Sat, 15 Jun 2024 11:21:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Sep 2024 14:18:35 +0000
++
+ opencv (4.6.0+dfsg-14) unstable; urgency=medium
+ 
+   * Team upload.
+   [ Gilles Filippini ]
+   * New patch python3.12.patch to fix FTBFS with Python 3.12.
+     Closes: #1076901.
+   [ Mo Zhou ]
+   * Fix depends-on-obsolete-package Depends: pkg-config => pkgconf.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Thu, 15 Aug 2024 19:00:00 +0200
  
  opencv (4.6.0+dfsg-13.1) unstable; urgency=medium