From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 13 Mar 2023 21:49:01 +0000 (+0000)
Subject: Merge version 4.6.0+dfsg-10+rpi1 and 4.6.0+dfsg-11 to produce 4.6.0+dfsg-11+rpi1
X-Git-Tag: archive/raspbian/4.6.0+dfsg-11+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6fc4edbc5e84458bf501d1f17b491379e44f85e;p=opencv.git

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

c6fc4edbc5e84458bf501d1f17b491379e44f85e
diff --cc debian/changelog
index 83f08fc,35b4b87..4397070
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- opencv (4.6.0+dfsg-10+rpi1) bookworm-staging; urgency=medium
++opencv (4.6.0+dfsg-11+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>  Sat, 11 Feb 2023 17:31:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Mar 2023 21:49:01 +0000
++
+ opencv (4.6.0+dfsg-11) unstable; urgency=medium
+ 
+   * Update d/rules.
+     Use -DCMAKE_SKIP_RPATH=ON instead of -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON.
+     (Closes: #1024638)
+ 
+  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Wed, 01 Mar 2023 10:21:45 +0900
  
  opencv (4.6.0+dfsg-10) unstable; urgency=medium