Control: tags 1073654 + patch
Please find a patch attached.
Chris
diff -Nru zsh-5.9/debian/changelog zsh-5.9/debian/changelog
--- zsh-5.9/debian/changelog 2024-01-09 11:15:01.000000000 +0100
+++ zsh-5.9/debian/changelog 2024-07-18 21:50:11.000000000 +0200
@@ -1,3 +1,10 @@
+zsh (5.9-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install into /usr-merged layout. (Closes: #1073654)
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 18 Jul 2024 21:50:11 +0200
+
zsh (5.9-6) unstable; urgency=medium
* [c366ecc] Cherry pick upstream commit ecd3f9c9 to fix FTBFS issue with
diff -Nru zsh-5.9/debian/rules zsh-5.9/debian/rules
--- zsh-5.9/debian/rules 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/rules 2024-07-18 21:50:11.000000000 +0200
@@ -16,7 +16,6 @@
CONFIGFLAGS = --prefix=/usr
CONFIGFLAGS += --mandir=/usr/share/man
-CONFIGFLAGS += --bindir=/bin
CONFIGFLAGS += LDFLAGS="-g $(H_LDFLAGS)"
CONFIGFLAGS += --infodir=/usr/share/info
@@ -140,20 +139,20 @@
override_dh_auto_install-arch:
cd obj && $(MAKE) install.bin install.modules \
DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
- rm debian/zsh/bin/zsh-5.[0-9]*
+ rm debian/zsh/usr/bin/zsh-5.[0-9]*
override_dh_shlibdeps-arch:
dh_shlibdeps -pzsh -- \
- -dDepends debian/zsh/bin/* \
+ -dDepends debian/zsh/usr/bin/* \
-dRecommends debian/zsh/usr/lib/*/zsh/*/zsh/*.so
execute_after_dh_installdocs-arch:
awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
execute_after_dh_install-arch:
- mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh-static
- mv debian/zsh-static/bin/zsh5 debian/zsh-static/bin/zsh5-static
- sed -e 's:#!/bin/zsh:#!/bin/zsh-static:' -i debian/zsh-static/bin/zsh5-static
+ mv debian/zsh-static/usr/bin/zsh debian/zsh-static/usr/bin/zsh-static
+ mv debian/zsh-static/usr/bin/zsh5 debian/zsh-static/usr/bin/zsh5-static
+ sed -e 's:#!/bin/zsh:#!/bin/zsh-static:' -i debian/zsh-static/usr/bin/zsh5-static
find debian/zsh-dev/usr/include/zsh -name '*.h' -o -name '*.mdh' | \
xargs sed -e 's@\.\./config\.h@config.h@;s@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' -i
diff -Nru zsh-5.9/debian/zsh.dirs zsh-5.9/debian/zsh.dirs
--- zsh-5.9/debian/zsh.dirs 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-bin
diff -Nru zsh-5.9/debian/zsh.install zsh-5.9/debian/zsh.install
--- zsh-5.9/debian/zsh.install 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.install 2024-07-18 21:50:11.000000000 +0200
@@ -1,2 +1,2 @@
-debian/zsh5 bin
+debian/zsh5 usr/bin
debian/shells.d/zsh usr/share/debianutils/shells.d/
diff -Nru zsh-5.9/debian/zsh.links zsh-5.9/debian/zsh.links
--- zsh-5.9/debian/zsh.links 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.links 2024-07-18 21:50:11.000000000 +0200
@@ -1,4 +1,4 @@
-/bin/zsh /bin/rzsh
+/usr/bin/zsh /usr/bin/rzsh
/usr/share/doc/zsh-common /usr/share/doc/zsh/doc
/usr/share/doc/zsh-common/NEWS.gz /usr/share/doc/zsh/NEWS.gz
/usr/share/doc/zsh-common/README.Debian /usr/share/doc/zsh/README.Debian
diff -Nru zsh-5.9/debian/zsh.lintian-overrides zsh-5.9/debian/zsh.lintian-overrides
--- zsh-5.9/debian/zsh.lintian-overrides 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.lintian-overrides 2024-07-18 21:50:11.000000000 +0200
@@ -1,11 +1,4 @@
# Only two of many files affected -> likely a false positive
zsh: hardening-no-fortify-functions [usr/lib*/zsh/*/zsh/zleparameter.so]
# Migration wrapper which is not meant to be used
-zsh: no-manual-page [bin/zsh5]
-# Code either adding all path variants to /etc/shells or fixing
-# usrmerge crap which would not be in the maintainer scripts if we
-# could just simply ship those symlinks inside the .deb.
-zsh: bin-sbin-mismatch usr/bin/zsh -> bin/zsh [postinst]
-zsh: bin-sbin-mismatch usr/bin/zsh -> bin/zsh [postrm]
-# It's a comment.
-zsh: bin-sbin-mismatch usr/bin/zsh -> bin/zsh [bin/zsh5]
+zsh: no-manual-page [usr/bin/zsh5]
diff -Nru zsh-5.9/debian/zsh.postinst zsh-5.9/debian/zsh.postinst
--- zsh-5.9/debian/zsh.postinst 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.postinst 2024-07-18 21:50:11.000000000 +0200
@@ -12,12 +12,6 @@
case "$1" in
(configure)
- # New hardcoded symlinks which unfortunately can't be shipped inside
- # the package itself since some people want to merge /bin and /usr/bin
- # against FHS and all Unix tradition.
- if [ ! -e /usr/bin/zsh -a ! -L /usr/bin/zsh ]; then
- ln -s /bin/zsh /usr/bin/zsh
- fi
;;
(abort-upgrade|abort-remove|abort-deconfigure)
exit 0
diff -Nru zsh-5.9/debian/zsh.postrm zsh-5.9/debian/zsh.postrm
--- zsh-5.9/debian/zsh.postrm 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh.postrm 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- (remove)
- # Remove hardcoded symlink again
- if [ -L /usr/bin/zsh ]; then
- rm -f /usr/bin/zsh
- fi
-
- ;;
-esac
-
-#DEBHELPER#
diff -Nru zsh-5.9/debian/zsh-static.dirs zsh-5.9/debian/zsh-static.dirs
--- zsh-5.9/debian/zsh-static.dirs 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh-static.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-bin
diff -Nru zsh-5.9/debian/zsh-static.install zsh-5.9/debian/zsh-static.install
--- zsh-5.9/debian/zsh-static.install 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh-static.install 2024-07-18 21:50:11.000000000 +0200
@@ -1,3 +1,3 @@
-debian/zsh5 bin
-obj-static/Src/zsh bin
+debian/zsh5 usr/bin
+obj-static/Src/zsh usr/bin
debian/shells.d/zsh-static usr/share/debianutils/shells.d/
diff -Nru zsh-5.9/debian/zsh-static.lintian-overrides zsh-5.9/debian/zsh-static.lintian-overrides
--- zsh-5.9/debian/zsh-static.lintian-overrides 2024-01-09 11:14:12.000000000 +0100
+++ zsh-5.9/debian/zsh-static.lintian-overrides 2024-07-18 21:50:11.000000000 +0200
@@ -1,5 +1,5 @@
-zsh-static: embedded-library ncurses [bin/zsh-static]
+zsh-static: embedded-library ncurses [usr/bin/zsh-static]
# Migration wrapper which is not meant to be used
-zsh-static: no-manual-page [bin/zsh5-static]
+zsh-static: no-manual-page [usr/bin/zsh5-static]
# I won't fix that as I disagree. Add an override to show my disagreeing
zsh-static: debian-news-entry-uses-asterisk
