From: Raspbian automatic forward porter Date: Tue, 9 Aug 2022 21:48:15 +0000 (+0100) Subject: Merge version 4.6.0+dfsg-4+rpi1 and 4.6.0+dfsg-6 to produce 4.6.0+dfsg-6+rpi1 X-Git-Tag: archive/raspbian/4.6.0+dfsg-6+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8469c715d704e22d8cfc58656cd470456be3de72;p=opencv.git Merge version 4.6.0+dfsg-4+rpi1 and 4.6.0+dfsg-6 to produce 4.6.0+dfsg-6+rpi1 --- 8469c715d704e22d8cfc58656cd470456be3de72 diff --cc debian/changelog index 87d7d21,32aa1a9..83cf79f --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,18 +1,25 @@@ - opencv (4.6.0+dfsg-4+rpi1) bookworm-staging; urgency=medium ++opencv (4.6.0+dfsg-6+rpi1) bookworm-staging; urgency=medium + ++ [changes brought forward from 4.6.0+dfsg-4+rpi1 by Peter Michael Green at Sun, 17 Jul 2022 00:23:33 +0000] + * Link with libatomic on armhf too. + - -- Peter Michael Green Sun, 17 Jul 2022 00:23:33 +0000 ++ -- Raspbian forward porter Tue, 09 Aug 2022 21:48:14 +0000 ++ + opencv (4.6.0+dfsg-6) unstable; urgency=medium + + * Team upload. + * Revert "Package ovis module" + Needs libogre-1.12-dev which is not available on mipsel + + -- Jochen Sprickerhof Tue, 09 Aug 2022 09:38:18 +0200 + + opencv (4.6.0+dfsg-5) unstable; urgency=medium + + * Team upload. + * Add patches to fix build (Closes: #1016684) + * Package ovis module + + -- Jochen Sprickerhof Tue, 09 Aug 2022 07:02:57 +0200 opencv (4.6.0+dfsg-4) unstable; urgency=medium