diff -pruN 4.12.5-3/debian/changelog 4.12.5-3ubuntu1/debian/changelog --- 4.12.5-3/debian/changelog 2022-01-29 23:10:57.000000000 +0000 +++ 4.12.5-3ubuntu1/debian/changelog 2022-01-31 14:34:04.000000000 +0000 @@ -1,3 +1,12 @@ +nanoc (4.12.5-3ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/skip-test-failing-in-ubuntu.patch: there is a test failing in the + Ubuntu autopkgtest env due to a proxy issue, and the IP address in use is + not easily predictable to be added manually (LP #1913586). + + -- Lucas Kanashiro Mon, 31 Jan 2022 11:34:04 -0300 + nanoc (4.12.5-3) unstable; urgency=medium * Add as a suffix the source version to version numbers of binary packages @@ -18,6 +27,15 @@ nanoc (4.12.5-2) unstable; urgency=mediu -- Cédric Boutillier Sat, 29 Jan 2022 16:06:24 +0100 +nanoc (4.12.5-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/skip-test-failing-in-ubuntu.patch: there is a test failing in the + Ubuntu autopkgtest env due to a proxy issue, and the IP address in use is + not easily predictable to be added manually (LP #1913586). + + -- Sergio Durigan Junior Fri, 28 Jan 2022 14:22:51 -0500 + nanoc (4.12.5-1) unstable; urgency=medium * Team upload. @@ -74,6 +92,14 @@ nanoc (4.11.18-1~1) experimental; urgenc -- Antonio Terceiro Fri, 29 Jan 2021 10:17:00 -0300 +nanoc (4.11.14-4ubuntu1) hirsute; urgency=medium + + * d/p/skip-test-failing-in-ubuntu.patch: there is a test failing in the + Ubuntu autopkgtest env due to a proxy issue, and the IP address in use is + not easily predictable to be added manually (LP: #1913586). + + -- Lucas Kanashiro Thu, 28 Jan 2021 09:49:05 -0300 + nanoc (4.11.14-4) unstable; urgency=medium * Skip nanoc-live tests failing on ipv6-only builders (Closes: #972701) diff -pruN 4.12.5-3/debian/control 4.12.5-3ubuntu1/debian/control --- 4.12.5-3/debian/control 2022-01-29 23:10:57.000000000 +0000 +++ 4.12.5-3ubuntu1/debian/control 2022-01-31 14:34:04.000000000 +0000 @@ -1,5 +1,6 @@ Source: nanoc -Maintainer: Debian Ruby Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Ruby Team Uploaders: Cédric Boutillier , Antonio Terceiro , Section: web diff -pruN 4.12.5-3/debian/patches/series 4.12.5-3ubuntu1/debian/patches/series --- 4.12.5-3/debian/patches/series 2022-01-29 23:10:57.000000000 +0000 +++ 4.12.5-3ubuntu1/debian/patches/series 2022-01-31 14:33:44.000000000 +0000 @@ -15,3 +15,4 @@ failing-tests-ipv6-only.patch 0015-nanoc-core-skip-tests-that-fail-under-autopkgtest.patch 0016-filesystem_spec-skip-tests-that-fail-on-debian.patch 0017-nanoc-core-require-nanoc-version-for-test.patch +skip-test-failing-in-ubuntu.patch diff -pruN 4.12.5-3/debian/patches/skip-test-failing-in-ubuntu.patch 4.12.5-3ubuntu1/debian/patches/skip-test-failing-in-ubuntu.patch --- 4.12.5-3/debian/patches/skip-test-failing-in-ubuntu.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.12.5-3ubuntu1/debian/patches/skip-test-failing-in-ubuntu.patch 2022-01-31 14:33:44.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Skip test failing in Ubuntu autopkgtest environment + The "Nanoc::CLI::Commands::View#run does not listen on non-local interfaces" + test tries to make use of a non-localhost IPv4 address associated to the + runner machine. However, in Ubuntu infrastructure this address is not allowed + by the $no_proxy variable. Moreover, this IP address is not predictable (it + might vary depending on the runner setup), therefore it cannot be manually + added to the test command. +Author: Lucas Kanashiro +Forwarded: not-needed +Last-Updated: 2021-01-28 + +--- a/nanoc-cli/spec/nanoc/cli/commands/view_spec.rb ++++ b/nanoc-cli/spec/nanoc/cli/commands/view_spec.rb +@@ -84,6 +84,6 @@ + end + end.to raise_error(/Failed to open TCP connection|execution expired/) + end +- end ++ end unless ENV["AUTOPKGTEST_TMP"] + end + end