Control: tags -1 patch
On 2021-09-07 14:15:08 +0200, Vincent Lefevre wrote:
> At
> https://buildd.debian.org/status/fetch.php?pkg=zsh&arch=amd64&ver=5.8-7&stamp=1630542289&raw=0
> (successful build on 2021-09-02), I can see:
>
> dh_gencontrol -a -- -VBuilt-Using="libcap2 (= 1:2.44-1), ncurses (=
> 6.2+20201114-4), ncurses (= 6.2+20201114-4), pcre3 (= 2:8.39-13), glibc (=
> 2.31-17), "
>
> Notice the duplicate "ncurses (= 6.2+20201114-4)". On my machine, the
> second one is replaced by " (= )", which yields the failure.
>
> Moreover, debian/rules has
>
> BUILT_USING=$(shell for pkg in libcap-dev libncurses-dev libncursesw5-dev
> libpcre3-dev libc-dev-bin; do dpkg-query -f '$${status}' -W $$pkg 2>&1 | grep
> -Fq installed && dpkg-query -f '$${source:Package} (= $${source:Version}), '
> -W $$pkg; done)
>
> while on my machine, libncursesw5-dev is not installed and is provided
> by libncurses-dev.
I suppose that libncursesw5-dev should be replaced by libncurses-dev
in every file under the debian directory, and that the resulting
duplicates should be removed. I've attached the corresponding patch,
which solves the FTBFS issue for me.
--
Vincent Lefèvre <vinc...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
diff -aurd zsh-5.8-a/debian/control zsh-5.8-b/debian/control
--- zsh-5.8-a/debian/control 2021-08-25 00:25:11.000000000 +0000
+++ zsh-5.8-b/debian/control 2021-09-07 12:17:57.521181547 +0000
@@ -10,7 +10,7 @@
libcap-dev [linux-any],
libelf-dev,
libgdbm-dev,
- libncursesw5-dev,
+ libncurses-dev,
libpcre3-dev
Build-Depends-Indep: cm-super-minimal,
ghostscript,
diff -aurd zsh-5.8-a/debian/rules zsh-5.8-b/debian/rules
--- zsh-5.8-a/debian/rules 2021-08-24 23:44:06.000000000 +0000
+++ zsh-5.8-b/debian/rules 2021-09-07 12:16:59.009746260 +0000
@@ -50,7 +50,7 @@
# resulting syntax might be invalid. Needed for packages which are
# also provided by other packages like libncurses-dev and
# libncursesw5-dev which both fulfil the according build-dependency.
-BUILT_USING=$(shell for pkg in libcap-dev libncurses-dev libncursesw5-dev
libpcre3-dev libc-dev-bin; do dpkg-query -f '$${status}' -W $$pkg 2>&1 | grep
-Fq installed && dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W
$$pkg; done)
+BUILT_USING=$(shell for pkg in libcap-dev libncurses-dev libpcre3-dev
libc-dev-bin; do dpkg-query -f '$${status}' -W $$pkg 2>&1 | grep -Fq installed
&& dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $$pkg; done)
%:
dh $@
diff -aurd zsh-5.8-a/debian/tests/control zsh-5.8-b/debian/tests/control
--- zsh-5.8-a/debian/tests/control 2021-08-24 23:50:41.000000000 +0000
+++ zsh-5.8-b/debian/tests/control 2021-09-07 12:17:38.993360527 +0000
@@ -2,7 +2,7 @@
Depends: libcap-dev [linux-any],
libelf-dev,
libgdbm-dev,
- libncursesw5-dev,
+ libncurses-dev,
libpcre3-dev,
zsh,
zsh-dev
