Merge version 4.6.0+dfsg-9+rpi1 and 4.6.0+dfsg-10 to produce 4.6.0+dfsg-10+rpi1 archive/raspbian/4.6.0+dfsg-10+rpi1 raspbian/4.6.0+dfsg-10+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sat, 11 Feb 2023 17:31:48 +0000 (17:31 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sat, 11 Feb 2023 17:31:48 +0000 (17:31 +0000)
1  2 
debian/changelog
debian/rules

index 67f268f66b99af01c5c47f010f7dadcf7672dfa7,df40a2a6d8f393bf2c004a2e7ddf5ea154e0e76a..83f08fcc467d2d8e363bd62ef670259428d9be41
@@@ -1,9 -1,10 +1,17 @@@
- opencv (4.6.0+dfsg-9+rpi1) bookworm-staging; urgency=medium
++opencv (4.6.0+dfsg-10+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, 26 Nov 2022 02:48:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Feb 2023 17:31:47 +0000
++
+ opencv (4.6.0+dfsg-10) unstable; urgency=medium
+   * Update d/rules.
+     Add -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON to configure of python extension
+     (Closes: #1024638)
+  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Mon, 16 Jan 2023 11:23:50 +0900
  
  opencv (4.6.0+dfsg-9) unstable; urgency=medium
  
diff --cc debian/rules
Simple merge