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

Merge opencv (4.10.0+dfsg-5) import into refs/heads/workingbranch

setup-py-for-egg

===================================================================

Gbp-Pq: Name setup-py-for-egg.patch

cmake-no-download

===================================================================

Gbp-Pq: Name cmake-no-download.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

cmake-dont-install-inexistent-files

===================================================================

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

opencv (4.10.0+dfsg-5) unstable; urgency=medium

  * Team upload.

  [ Mo Zhou ]
  * Remove Build-Depends on libopenjpip-server. (Closes: #1100645)

[dgit import unpatched opencv 4.10.0+dfsg-5]

Import opencv_4.10.0+dfsg-5.debian.tar.xz

[dgit import tarball opencv 4.10.0+dfsg-5 opencv_4.10.0+dfsg-5.debian.tar.xz]

Merge opencv (4.10.0+dfsg-3) import into refs/heads/workingbranch

cmake-no-download

===================================================================

Gbp-Pq: Name cmake-no-download.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

cmake-dont-install-inexistent-files

===================================================================

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

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)

[dgit import unpatched opencv 4.10.0+dfsg-3]

Import opencv_4.10.0+dfsg-3.debian.tar.xz

[dgit import tarball opencv 4.10.0+dfsg-3 opencv_4.10.0+dfsg-3.debian.tar.xz]

Import opencv_4.10.0+dfsg.orig.tar.xz

[dgit import orig opencv_4.10.0+dfsg.orig.tar.xz]

Import opencv_4.10.0+dfsg.orig-contrib.tar.xz

[dgit import orig opencv_4.10.0+dfsg.orig-contrib.tar.xz]

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

Merge opencv (4.6.0+dfsg-14) import into refs/heads/workingbranch

python3.12

commit 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd
Author: Sérgio M. Basto <sergio@serjux.com>
Date:   Sun Oct 1 16:12:25 2023 +0100

    `numpy.distutils` is removed in numpy 1.26 on Python 3.12.

    so we don't use numpy.distutils to get includes dirs of python-numpy

Gbp-Pq: Name python3.12.patch

cmake-no-download

===================================================================

Gbp-Pq: Name cmake-no-download.patch

fix(wechat_qrcode): fixed memory leaks

Gbp-Pq: Name 0010-fix-wechat_qrcode-fixed-memory-leaks.patch

fix(wechat_qrcode): Init nBytes after the count value is determined (#3480)

* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
Gbp-Pq: Name 0009-fix-wechat_qrcode-Init-nBytes-after-the-count-value-.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

Fix building error with OGRE 1.12.9

Gbp-Pq: Name 0005-Fix-building-error-with-OGRE-1.12.9.patch

Add missing header for LIBAVCODEC_VERSION_INT

Gbp-Pq: Name 0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch

cmake-dont-install-inexistent-files

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

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.

[dgit import unpatched opencv 4.6.0+dfsg-14]

Import opencv_4.6.0+dfsg-14.debian.tar.xz

[dgit import tarball opencv 4.6.0+dfsg-14 opencv_4.6.0+dfsg-14.debian.tar.xz]

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

Merge opencv (4.6.0+dfsg-13.1) import into refs/heads/workingbranch

cmake-no-download

===================================================================

Gbp-Pq: Name cmake-no-download.patch

fix(wechat_qrcode): fixed memory leaks

Gbp-Pq: Name 0010-fix-wechat_qrcode-fixed-memory-leaks.patch

fix(wechat_qrcode): Init nBytes after the count value is determined (#3480)

* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
Gbp-Pq: Name 0009-fix-wechat_qrcode-Init-nBytes-after-the-count-value-.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

Fix building error with OGRE 1.12.9

Gbp-Pq: Name 0005-Fix-building-error-with-OGRE-1.12.9.patch

Add missing header for LIBAVCODEC_VERSION_INT

Gbp-Pq: Name 0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch

cmake-dont-install-inexistent-files

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

opencv (4.6.0+dfsg-13.1) unstable; urgency=medium

  * Non-maintainer upload.
  * Rename libraries for 64-bit time_t transition.  Closes: #1062839

[dgit import unpatched opencv 4.6.0+dfsg-13.1]

Import opencv_4.6.0+dfsg-13.1.debian.tar.xz

[dgit import tarball opencv 4.6.0+dfsg-13.1 opencv_4.6.0+dfsg-13.1.debian.tar.xz]

Merge version 4.6.0+dfsg-12+rpi1 and 4.6.0+dfsg-13 to produce 4.6.0+dfsg-13+rpi1

Merge opencv (4.6.0+dfsg-13) import into refs/heads/workingbranch

cmake-no-download

===================================================================

Gbp-Pq: Name cmake-no-download.patch

fix(wechat_qrcode): fixed memory leaks

Gbp-Pq: Name 0010-fix-wechat_qrcode-fixed-memory-leaks.patch

fix(wechat_qrcode): Init nBytes after the count value is determined (#3480)

* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
Gbp-Pq: Name 0009-fix-wechat_qrcode-Init-nBytes-after-the-count-value-.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

Fix building error with OGRE 1.12.9

Gbp-Pq: Name 0005-Fix-building-error-with-OGRE-1.12.9.patch

Add missing header for LIBAVCODEC_VERSION_INT

Gbp-Pq: Name 0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch

cmake-dont-install-inexistent-files

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

opencv (4.6.0+dfsg-13) unstable; urgency=medium

  * Embed and enable the 3rdparty source for QUIRC as per user request.
  * Add several missing build dependencies for libopenjp, libva and imath.
  * Patch: remove the downloading function from cmake files.
  * Fix obsolete B-D libgl1-mesa-dev => libgl-dev.
  * Update copyright and lintian overrides. It's lintian-clean now.

[dgit import unpatched opencv 4.6.0+dfsg-13]

Import opencv_4.6.0+dfsg-13.debian.tar.xz

[dgit import tarball opencv 4.6.0+dfsg-13 opencv_4.6.0+dfsg-13.debian.tar.xz]

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

Merge opencv (4.6.0+dfsg-12) import into refs/heads/workingbranch

fix(wechat_qrcode): fixed memory leaks

Gbp-Pq: Name 0010-fix-wechat_qrcode-fixed-memory-leaks.patch

fix(wechat_qrcode): Init nBytes after the count value is determined (#3480)

* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
Gbp-Pq: Name 0009-fix-wechat_qrcode-Init-nBytes-after-the-count-value-.patch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

Fix building error with OGRE 1.12.9

Gbp-Pq: Name 0005-Fix-building-error-with-OGRE-1.12.9.patch

Add missing header for LIBAVCODEC_VERSION_INT

Gbp-Pq: Name 0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch

cmake-dont-install-inexistent-files

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

opencv (4.6.0+dfsg-12) unstable; urgency=medium

  * Team upload.

  [ Andreas Beckmann ]
  * libopencv-core406: Add Breaks: libopencv-core4.5 for smoother upgrades from bullseye
    (Closes: #1035886)

  [ Jochen Sprickerhof ]
  * Add upstream patches for CVE-2023-2617 and CVE-2023-2618 (Closes: #1035954)

[dgit import unpatched opencv 4.6.0+dfsg-12]

Import opencv_4.6.0+dfsg-12.debian.tar.xz

[dgit import tarball opencv 4.6.0+dfsg-12 opencv_4.6.0+dfsg-12.debian.tar.xz]

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

Merge opencv (4.6.0+dfsg-11) import into refs/heads/workingbranch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch

Fix building error with OGRE 1.12.9

Gbp-Pq: Name 0005-Fix-building-error-with-OGRE-1.12.9.patch

Add missing header for LIBAVCODEC_VERSION_INT

Gbp-Pq: Name 0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch

cmake-dont-install-inexistent-files

Gbp-Pq: Name cmake-dont-install-inexistent-files.patch

[PATCH 2/2] use system-installed jquery

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Gbp-Pq: Name change_jquery.js_path

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)

[dgit import unpatched opencv 4.6.0+dfsg-11]

Import opencv_4.6.0+dfsg-11.debian.tar.xz

[dgit import tarball opencv 4.6.0+dfsg-11 opencv_4.6.0+dfsg-11.debian.tar.xz]

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

Merge opencv (4.6.0+dfsg-10) import into refs/heads/workingbranch

Do not embed build directory in documentation

This makes the documentation build reproducibly.

Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch

Do not embed build directory in binaries

This makes the opencv core module build reproducibly.

Gbp-Pq: Name 0008-Do-not-embed-build-directory-in-binaries.patch

Build highgui module with QT support

Removes the dependency on the removed non-free Milky icon set. Four
directional arrows are replaced by standard Qt icons. The other icons
are replaced by corresponding icons from the freedesktop.org Icon Naming
Specification.

Gbp-Pq: Name 0007-Build-highgui-module-with-QT-support.patch

Fix LAPACK finding CMake code

On Debian cblas.h and lapacke.h are not installed in the same include
directory. This does not matter when compiling, but the custom header
check in OpenCV fails on it. Force OpenCV to use the standard CMake
check_include_file function to do the check so it succeeds.

Gbp-Pq: Name 0006-Fix-LAPACK-finding-CMake-code.patch