From 720aca52c4459207c81f7150c81387ae240daebd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Feb 2025 05:56:24 +0100 Subject: [PATCH] Skipping zcat for now (Closes: #902936, #903931). Signed-off-by: Daniel Baumann --- debian/rules | 4 ++++ debian/zutils.lintian-overrides | 2 +- debian/{zutils.postrm => zutils.postinst} | 15 ++++++++++----- debian/zutils.postrm | 3 ++- debian/zutils.preinst | 14 +++++++++++++- 5 files changed, 30 insertions(+), 8 deletions(-) copy debian/{zutils.postrm => zutils.postinst} (58%) diff --git a/debian/rules b/debian/rules index 80e5fe9..6e2196b 100755 --- a/debian/rules +++ b/debian/rules @@ -23,5 +23,9 @@ override_dh_auto_install: # removing unused files rm -f debian/zutils/usr/share/info/dir* + # skipping zcat (#902936, #903931) + mv debian/zutils/bin/zcat debian/zutils/bin/zcat.zutils + mv debian/zutils/usr/share/man/man1/zcat.1 debian/zutils/usr/share/man/man1/zcat.zutils.1 + override_dh_gencontrol: dh_gencontrol -- -Vbuilt-using="glibc (= $$(dpkg-query --show --showformat='$${source:Version}' libc-dev-bin))" diff --git a/debian/zutils.lintian-overrides b/debian/zutils.lintian-overrides index dfcaf05..62ec06b 100644 --- a/debian/zutils.lintian-overrides +++ b/debian/zutils.lintian-overrides @@ -1,4 +1,4 @@ -zutils: statically-linked-binary bin/zcat +zutils: statically-linked-binary bin/zcat.zutils zutils: statically-linked-binary bin/zcmp zutils: statically-linked-binary bin/zdiff zutils: statically-linked-binary bin/zgrep diff --git a/debian/zutils.postrm b/debian/zutils.postinst similarity index 58% copy from debian/zutils.postrm copy to debian/zutils.postinst index d732840..66ef2da 100755 --- a/debian/zutils.postrm +++ b/debian/zutils.postinst @@ -3,20 +3,25 @@ set -e case "${1}" in - remove) - for FILE in zcat zcmp zdiff zegrep zfgrep zgrep - do + configure) + # restoring zcat (#902936, #903931) + for FILE in zcat + do if [ ! -e /bin/${FILE}.gzip ] + then + continue + fi + dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE} dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz done ;; - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + abort-upgrade|abort-remove|abort-deconfigure) ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument \`${1}'" >&2 exit 1 ;; esac diff --git a/debian/zutils.postrm b/debian/zutils.postrm index d732840..654c983 100755 --- a/debian/zutils.postrm +++ b/debian/zutils.postrm @@ -4,7 +4,8 @@ set -e case "${1}" in remove) - for FILE in zcat zcmp zdiff zegrep zfgrep zgrep + # skipping zcat (#902936, #903931) + for FILE in zcmp zdiff zegrep zfgrep zgrep do dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE} dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz diff --git a/debian/zutils.preinst b/debian/zutils.preinst index b9aa4a5..68e995c 100755 --- a/debian/zutils.preinst +++ b/debian/zutils.preinst @@ -4,11 +4,23 @@ set -e case "${1}" in install) - for FILE in zcat zcmp zdiff zegrep zfgrep zgrep + # skipping zcat (#902936, #903931) + for FILE in zcmp zdiff zegrep zfgrep zgrep do dpkg-divert --package zutils --quiet --add --rename --divert /bin/${FILE}.gzip /bin/${FILE} dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz done + + # restoring zcat (#902936, #903931) + for FILE in zcat + do if [ ! -e /bin/${FILE}.gzip ] + then + continue + fi + + dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE} + dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz + done ;; upgrade|abort-upgrade)