Merge ~danilogondolfo/ubuntu/+source/icdiff:autopkgtest_fix3 into ubuntu/+source/icdiff:ubuntu/devel

[Danilo Egea Gondolfo]

Based on the upstream fix: https://github.com/jeffkaufman/icdiff/commit/1c2a042a3c2c1041a0ec011c9f33c3ba77c06de0

[Simon Chopin (schopin)]

Turns out it's been uploaded already: https://launchpad.net/ubuntu/+source/icdiff/2.0.6-1ubuntu1

Closing as merged.

Edit: well, I would have liked to close it as merged, but apparently I lack permissions to do so?

diff --git a/debian/changelog b/debian/changelog
index d213def..ed7e0d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+icdiff (2.0.6-1ubuntu1) lunar; urgency=medium
+
+  * Fix autopkgtests.
+      - d/p/0001-Don-t-assume-process-substitution-will-be-fd-63.patch:
+        Fixes autopkgtests on ubuntu. One of the tests rely on getting the
+        file descriptor 63 from a process substitution to succeed, what is
+        not happening in the autopkgtest.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Thu, 23 Mar 2023 09:57:11 -0300
+
 icdiff (2.0.6-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index e353fbf..ae4431a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: icdiff
-Maintainer: Sascha Steinbiss <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sascha Steinbiss <[e-mail]>
 Section: utils
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
diff --git a/debian/patches/0001-Don-t-assume-process-substitution-will-be-fd-63.patch b/debian/patches/0001-Don-t-assume-process-substitution-will-be-fd-63.patch
new file mode 100644
index 0000000..06d6962
--- /dev/null
+++ b/debian/patches/0001-Don-t-assume-process-substitution-will-be-fd-63.patch
@@ -0,0 +1,32 @@
+From: Danilo Egea Gondolfo <[e-mail]>
+Date: Thu, 23 Mar 2023 09:33:12 -0300
+Subject: Don't assume process substitution will be fd/63
+
+When running tests with autopkgtest, file descriptors 63 and 62 will be
+found in the process context. One of the tests (gold-exit-process-sub)
+will rely on getting the descriptor 63 from a process substitution to
+succeed. It would be the first descriptor provided by bash during a
+process substitution.
+
+Apparently, this test passes on Debian so it might happen due to
+the test environment.
+
+Origin: upstream, https://github.com/jeffkaufman/icdiff/commit/1c2a042a3c2c1041a0ec011c9f33c3ba77c06de0
+
+---
+ test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test.sh
++++ b/test.sh
+@@ -158,7 +158,9 @@
+ check_gold 2 gold-bad-encoding.txt tests/input-{1,2}.txt --encoding=nonexistend_encoding
+ check_gold 0 gold-recursive-with-exclude.txt --recursive -x c tests/{a,b} --cols=80
+ check_gold 1 gold-recursive-with-exclude2.txt --recursive -x 'excl*' tests/test-with-exclude/{a,b} --cols=80
+-check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --cols=80
++# tests/gold-exit-process-sub must be empty
++:> tests/gold-exit-process-sub
++check_gold 0 gold-exit-process-sub tests/input-1.txt <(cat tests/input-1.txt) --no-headers --cols=80
+ 
+ rm -f tests/permissions-{a,b}
+ touch tests/permissions-{a,b}
diff --git a/debian/patches/series b/debian/patches/series
index ad16a14..709d254 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-message-on-rm-nonexistant.patch
+0001-Don-t-assume-process-substitution-will-be-fd-63.patch