Merge ~vpa1977/ubuntu/+source/libthread-pool:sync into ubuntu/+source/libthread-pool:ubuntu/devel

[Vladimir Petko]

This is a sync MR.

The changes in commit cbcc0e95da892727714c34db67172ad0b8cbaf8c for armhf autopkgtests where integrated in 4.0.0-2~exp1 and can be dropped.

PPA: ppa:vpa1977/plusone[1]

Testing:
 - rebuilt in noble [2]
 - autopkgtests:

- libthread-pool/4.0.0-2ubuntu1~ppa1
    + ✅ libthread-pool on noble for amd64 @ 27.02.24 05:34:44 Log️ 🗒️
    + ✅ libthread-pool on noble for arm64 @ 27.02.24 05:33:27 Log️ 🗒️
    + ✅ libthread-pool on noble for armhf @ 27.02.24 05:38:00 Log️ 🗒️
    + ❌ libthread-pool on noble for i386 @ 27.02.24 05:37:42 Log️ 🗒️ [3]
      • run-unit-test FAIL 🟥
    + ✅ libthread-pool on noble for ppc64el @ 27.02.24 05:36:47 Log️ 🗒️
    + ✅ libthread-pool on noble for s390x @ 27.02.24 05:35:42 Log️ 🗒️

Package is uninstallable on i386.

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+packages
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15820410/+listing-archive-extra
[3] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/i386/libt/libthread-pool/20240227_053742_66480@/log.gz

Unmerged commits

47fc941... by Vladimir Petko on 2024-02-27

rebuild

diff --git a/debian/changelog b/debian/changelog
index a53ec33..9be9995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,31 @@
+<<<<<<< debian/changelog
 libthread-pool (4.0.0-1ubuntu1) lunar; urgency=medium
 
   * debian/patches/fix-unsigned-cast.patch: fix FTBS for armhf (LP: #2009537).
 
  -- Vladimir Petko <[e-mail]>  Tue, 07 Mar 2023 15:53:47 +1300
+=======
+libthread-pool (4.0.0-2ubuntu1) noble; urgency=medium
+
+  * build debian version to verify before a sync
+
+ -- Vladimir Petko <[e-mail]>  Tue, 27 Feb 2024 16:41:09 +1300
+
+libthread-pool (4.0.0-2) unstable; urgency=medium
+
+  * Upload to unstable
+  * Standards-Version: 4.6.2 (routine-update)
+
+ -- Andreas Tille <[e-mail]>  Tue, 13 Feb 2024 08:13:54 +0100
+
+libthread-pool (4.0.0-2~exp) experimental; urgency=medium
+
+  [ Vladimir Petko ]
+  * Use size_t type for max() comparison
+    Closes: #1032532 (LP: #2009537)
+
+ -- Andreas Tille <[e-mail]>  Thu, 09 Mar 2023 11:14:22 +0100
+>>>>>>> debian/changelog
 
 libthread-pool (4.0.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 09ae3c8..2d88c65 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                d-shlibs,
                rename,
                libgtest-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/libthread-pool
 Vcs-Git: https://salsa.debian.org/med-team/libthread-pool.git
 Homepage: https://github.com/rvaser/thread_pool
diff --git a/debian/patches/fix-unsigned-cast.patch b/debian/patches/fix-unsigned-cast.patch
index 9444624..f2c7ecb 100644
--- a/debian/patches/fix-unsigned-cast.patch
+++ b/debian/patches/fix-unsigned-cast.patch
@@ -2,9 +2,14 @@ Description: Use size_t type for max() comparison
  size_t is defined in an architecture-specific way. Construct size_t from int to avoid
  the type mismatch error.
 Author: Vladimir Petko <[e-mail]>
+<<<<<<< debian/patches/fix-unsigned-cast.patch
 Bug: https://github.com/rvaser/thread_pool/pull/6
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1032532
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libthread-pool/+bug/2009537
+=======
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libthread-pool/+bug/2009537
+Bug-Debian: https://bugs.debian.org/1032532
+>>>>>>> debian/patches/fix-unsigned-cast.patch
 Last-Update: 2023-03-08
 --- a/include/thread_pool/thread_pool.hpp
 +++ b/include/thread_pool/thread_pool.hpp