From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 24 Apr 2025 16:14:08 +0000 (+0000)
Subject: Manual merge of version 4.6.0+dfsg-14+rpi1 and 4.10.0+dfsg-5 to produce 4.10.0+dfsg... 
X-Git-Tag: archive/raspbian/4.10.0+dfsg-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a70ee752d1bbf2f5d93936e6c36f907efaa50294;p=opencv.git

Manual merge of version 4.6.0+dfsg-14+rpi1 and 4.10.0+dfsg-5 to produce 4.10.0+dfsg-5+rpi1
---

a70ee752d1bbf2f5d93936e6c36f907efaa50294
diff --cc debian/changelog
index 643e93c,1128eb2..ccdeaa2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,59 +1,66 @@@
- opencv (4.6.0+dfsg-14+rpi1) trixie-staging; urgency=medium
++opencv (4.10.0+dfsg-5+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>  Mon, 09 Sep 2024 14:18:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Mar 2025 01:27:25 +0000
++
+ opencv (4.10.0+dfsg-5) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Mo Zhou ]
+   * Remove Build-Depends on libopenjpip-server. (Closes: #1100645)
+ 
+  -- Bastian Germann <bage@debian.org>  Tue, 18 Mar 2025 20:39:02 +0100
+ 
+ opencv (4.10.0+dfsg-4) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * Disable 1394 Build-Dep on all non-linux OSes. (Closes: #1099990)
+ 
+   [ Mo Zhou ]
+   * Delete the t64:Provides leftover from d/control. (Closes: #1099765)
+   * Mark python3-opencv as Multi-Arch: no.
+   * Add the egg-info directory for python3-opencv. (Closes: #1099764)
+   * Generate installed-files.txt for egg-info.
+ 
+  -- Mo Zhou <lumin@debian.org>  Fri, 14 Mar 2025 23:47:21 -0400
+ 
+ opencv (4.10.0+dfsg-3) unstable; urgency=medium
+ 
+   * No need to install duplicate license information. (Closes: #1041650)
+   * Properly clean up embedded 3rdparty source code. (Closes: #1046728)
+   * Explicitly add numpy in the dependency field of python3-opencv.
+   * Add autopkgtest for cv::boundingRect. (Closes: #1017348)
+   * Add libtbb-dev to Build-Depends for alpha architecture. (Closes: #1084865)
+ 
+  -- Mo Zhou <lumin@debian.org>  Tue, 25 Feb 2025 00:55:44 -0500
+ 
+ opencv (4.10.0+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable and start transition.
+ 
+  -- Mo Zhou <lumin@debian.org>  Fri, 14 Feb 2025 13:19:39 -0500
+ 
+ opencv (4.10.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream version 4.10.0+dfsg
+     * copyright: execlude one more lena image from 4.10.0 release.
+     * Sync the 3rdparty quirc library to 4.10.0 version.
+     * Bump SOVERSION to 410.
+   * Rebase existing patches, refresh existing ones and remove merged ones.
+   * d/rules: Specify WITH_FLATBUFFERS=OFF.
+   * rules: Delete code for mipsel architecture.
+   * Update install files: `barcode` module was merged into objdetect.
+   * Install the new signal module from contrib.
+   * Remove the Breaks+Replaces introduced during the t64 transition --
+     They are no longer needed.
+   * Bump version in Java package control files.
+   * Update lintian overrides and copyright file.
+   * Upload to experimental.
+ 
+  -- Mo Zhou <lumin@debian.org>  Tue, 10 Dec 2024 23:40:09 -0500
  
  opencv (4.6.0+dfsg-14) unstable; urgency=medium
  
diff --cc debian/rules
index 6a21b65,121c93c..11dd5c9
--- a/debian/rules
+++ b/debian/rules
@@@ -48,13 -48,7 +48,7 @@@ ifeq (,$(filter $(DEB_HOST_ARCH), hppa 
  CMAKE_JAVA_FLAGS += -DBUILD_JAVA=ON
  endif
  
- # mitigate compiler OOM during build
- ifeq ($(DEB_HOST_ARCH),mipsel)
- export DEB_BUILD_OPTIONS=noopt
- CXXFLAGS+=-gsplit-dwarf
- endif
- 
- ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mipsel powerpc sh4))
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k powerpc sh4))
++ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k powerpc sh4))
  export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif