lzip/zutils
1
0
Fork 0
Code Issues Activity

Applying patch from Helmut Grohne <helmut@subdivi.de> to duplicate diversion via DEP17 M18 (Closes: #1059534).

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 06:04:26 +01:00
parent 2499ddddec
commit 7c9be7703d
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/rules vendored
View file

@ -6,7 +6,7 @@ include /usr/share/dpkg/buildtools.mk
dh ${@} dh ${@}
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --exec-prefix=/ CXX=$(CXX) dh_auto_configure -- CXX=$(CXX)
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- DESTDIR=$(CURDIR)/debian/zutils dh_auto_install -- DESTDIR=$(CURDIR)/debian/zutils

3
debian/zutils.postrm vendored
View file

@ -6,7 +6,8 @@ case "${1}" in
remove) remove)
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
do do
dpkg-divert --package zutils --quiet --remove --rename --divert /bin/${FILE}.gzip /bin/${FILE} dpkg-divert --package zutils --quiet --remove --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
dpkg-divert --package zutils --quiet --remove --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/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 dpkg-divert --package zutils --quiet --remove --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
done done
;; ;;

30
debian/zutils.preinst vendored
View file

@ -2,16 +2,42 @@
set -e set -e
# DEP17 M18: Duplicate diversion in aliased location /bin.
case "${1}" in case "${1}" in
install) install)
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
do do
dpkg-divert --package zutils --quiet --add --rename --divert /bin/${FILE}.gzip /bin/${FILE} dpkg-divert --package zutils --quiet --add --rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
dpkg-divert --package zutils --quiet --add --rename --divert "/bin/$FILE.gzip.usr-is-merged" "/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 dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
done done
;; ;;
abort-upgrade|upgrade) upgrade)
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
do
TRUENAME=$(dpkg-divert --truename "/usr/bin/$FILE")
if test "$TRUENAME" = "/usr/bin/$FILE.usr-is-merged"; then
# gzip.preinst duplicated the diversion for us
dpkg-divert --package zutils --quiet --remove --no-rename --divert "/usr/bin/$FILE.usr-is-merged" "/usr/bin/$FILE"
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$TOOL.gzip.usr-is-merged" "/bin/$TOOL"
elif test "$TRUENAME" != "/usr/bin/$FILE.gzip"; then
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/$FILE.gzip" "/usr/bin/$FILE"
TRUENAME=$(dpkg-divert --truename "/bin/$FILE")
if test "$TRUENAME" != "/bin/$FILE.gzip.usr-is-merged"; then
dpkg-divert --package zutils --quiet --remove --no-rename "/bin/$FILE"
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/$FILE.gzip.usr-is-merged" "/bin/$FILE"
if test -e "$DPKG_ROOT$TRUENAME" -o -h "$DPKG_ROOT$TRUENAME"; then
mv "$DPKG_ROOT$TRUENAME" "$DPKG_ROOT/bin/$FILE.gzip.usr-is-merged"
fi
fi
fi
done
;;
abort-upgrade)
;; ;;