diff -pruN 1.51.0-2/debian/changelog 1.51.0-2ubuntu1/debian/changelog --- 1.51.0-2/debian/changelog 2025-08-24 15:48:29.000000000 +0000 +++ 1.51.0-2ubuntu1/debian/changelog 2025-10-31 10:39:41.000000000 +0000 @@ -1,3 +1,12 @@ +libuv1 (1.51.0-2ubuntu1) resolute; urgency=medium + + * Merge with Debian unstable (lp: #2130129). Remaining changes: + * d/p/fix-tests-on-ubuntu-s390x.patch: fix s390x FTBFS on Ubuntu by + increasing timer delays in the idle_starvation and timer_from_check tests. + (LP #2099827) + + -- Sebastien Bacher Fri, 31 Oct 2025 11:39:41 +0100 + libuv1 (1.51.0-2) unstable; urgency=medium [ Dominique Dumont ] @@ -19,6 +28,14 @@ libuv1 (1.51.0-1) experimental; urgency= -- Dominique Dumont Sat, 09 Aug 2025 18:50:29 +0200 +libuv1 (1.50.0-2ubuntu1) plucky; urgency=medium + + * d/p/fix-tests-on-ubuntu-s390x.patch: fix s390x FTBFS on Ubuntu by + increasing timer delays in the idle_starvation and timer_from_check tests. + (LP: #2099827) + + -- Mateus Rodrigues de Morais Tue, 25 Feb 2025 14:09:40 -0300 + libuv1 (1.50.0-2) unstable; urgency=medium [ Jérémy Lal ] diff -pruN 1.51.0-2/debian/control 1.51.0-2ubuntu1/debian/control --- 1.51.0-2/debian/control 2025-08-24 12:33:13.000000000 +0000 +++ 1.51.0-2ubuntu1/debian/control 2025-10-31 10:39:41.000000000 +0000 @@ -1,5 +1,6 @@ Source: libuv1 -Maintainer: Dominique Dumont +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dominique Dumont Uploaders: Jérémy Lal Section: libs Priority: optional diff -pruN 1.51.0-2/debian/patches/fix-tests-on-ubuntu-s390x.patch 1.51.0-2ubuntu1/debian/patches/fix-tests-on-ubuntu-s390x.patch --- 1.51.0-2/debian/patches/fix-tests-on-ubuntu-s390x.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.51.0-2ubuntu1/debian/patches/fix-tests-on-ubuntu-s390x.patch 2025-10-31 10:38:13.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Fix s390x FTBFS on Ubuntu + The idle_starvation and timer_from_check tests were failing during the s390x + build on Ubuntu. This patch increases the timer delay in the uv_timer_start + function call from 50ms to 500ms to avoid the failures. +Author: Mateus Rodrigues de Morais +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libuv1/+bug/2099827 +Last-Update: 2025-02-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: libuv1-gu/test/test-idle.c +=================================================================== +--- libuv1-gu.orig/test/test-idle.c 2025-02-25 13:58:42.000000000 -0300 ++++ libuv1-gu/test/test-idle.c 2025-02-25 14:00:09.608010209 -0300 +@@ -84,7 +84,7 @@ + + r = uv_timer_init(uv_default_loop(), &timer_handle); + ASSERT_OK(r); +- r = uv_timer_start(&timer_handle, timer_cb, 50, 0); ++ r = uv_timer_start(&timer_handle, timer_cb, 500, 0); + ASSERT_OK(r); + + r = uv_run(uv_default_loop(), UV_RUN_DEFAULT); +Index: libuv1-gu/test/test-timer-from-check.c +=================================================================== +--- libuv1-gu.orig/test/test-timer-from-check.c 2025-02-25 13:58:42.000000000 -0300 ++++ libuv1-gu/test/test-timer-from-check.c 2025-02-25 14:00:18.536090484 -0300 +@@ -52,7 +52,7 @@ + static void check_cb(uv_check_t* handle) { + ASSERT_OK(uv_check_stop(&check_handle)); + ASSERT_OK(uv_timer_stop(&timer_handle)); /* Runs before timer_cb. */ +- ASSERT_OK(uv_timer_start(&timer_handle, timer_cb, 50, 0)); ++ ASSERT_OK(uv_timer_start(&timer_handle, timer_cb, 500, 0)); + ASSERT_OK(uv_prepare_start(&prepare_handle, prepare_cb)); + ASSERT_OK(prepare_cb_called); + ASSERT_OK(check_cb_called); +@@ -66,7 +66,7 @@ + ASSERT_OK(uv_check_init(uv_default_loop(), &check_handle)); + ASSERT_OK(uv_check_start(&check_handle, check_cb)); + ASSERT_OK(uv_timer_init(uv_default_loop(), &timer_handle)); +- ASSERT_OK(uv_timer_start(&timer_handle, timer_cb, 50, 0)); ++ ASSERT_OK(uv_timer_start(&timer_handle, timer_cb, 500, 0)); + ASSERT_OK(uv_run(uv_default_loop(), UV_RUN_DEFAULT)); + ASSERT_EQ(1, prepare_cb_called); + ASSERT_EQ(1, check_cb_called); diff -pruN 1.51.0-2/debian/patches/series 1.51.0-2ubuntu1/debian/patches/series --- 1.51.0-2/debian/patches/series 2025-08-24 12:33:13.000000000 +0000 +++ 1.51.0-2ubuntu1/debian/patches/series 2025-10-31 10:38:29.000000000 +0000 @@ -6,3 +6,4 @@ skip-multicast-test privacy-breach-generic.patch fix-thread-priority-test sh4-disable-io_uring.patch +fix-tests-on-ubuntu-s390x.patch