diff options
| -rwxr-xr-x | debian/rules | 11 | ||||
| -rw-r--r-- | debian/zsh-static.dirs | 1 | ||||
| -rw-r--r-- | debian/zsh-static.install | 4 | ||||
| -rw-r--r-- | debian/zsh-static.lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/zsh.dirs | 1 | ||||
| -rw-r--r-- | debian/zsh.install | 2 | ||||
| -rw-r--r-- | debian/zsh.links | 2 | ||||
| -rw-r--r-- | debian/zsh.lintian-overrides | 9 | ||||
| -rw-r--r-- | debian/zsh.postinst | 6 | ||||
| -rw-r--r-- | debian/zsh.postrm | 15 |
10 files changed, 12 insertions, 43 deletions
diff --git a/debian/rules b/debian/rules index 4a6d8f90c..530637cbe 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,6 @@ CFLAGS += -Wall -g 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_compress-indep: 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 --git a/debian/zsh-static.dirs b/debian/zsh-static.dirs deleted file mode 100644 index ba077a403..000000000 --- a/debian/zsh-static.dirs +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/debian/zsh-static.install b/debian/zsh-static.install index a01955f03..5ca991957 100644 --- a/debian/zsh-static.install +++ b/debian/zsh-static.install @@ -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 --git a/debian/zsh-static.lintian-overrides b/debian/zsh-static.lintian-overrides index bbf22096c..2dc299da6 100644 --- a/debian/zsh-static.lintian-overrides +++ b/debian/zsh-static.lintian-overrides @@ -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 diff --git a/debian/zsh.dirs b/debian/zsh.dirs deleted file mode 100644 index ba077a403..000000000 --- a/debian/zsh.dirs +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/debian/zsh.install b/debian/zsh.install index 2291d6285..9e2482ea8 100644 --- a/debian/zsh.install +++ b/debian/zsh.install @@ -1,2 +1,2 @@ -debian/zsh5 bin +debian/zsh5 usr/bin debian/shells.d/zsh usr/share/debianutils/shells.d/ diff --git a/debian/zsh.links b/debian/zsh.links index f7eae5f0f..676f470f1 100644 --- a/debian/zsh.links +++ b/debian/zsh.links @@ -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 --git a/debian/zsh.lintian-overrides b/debian/zsh.lintian-overrides index c289d2872..3cea386de 100644 --- a/debian/zsh.lintian-overrides +++ b/debian/zsh.lintian-overrides @@ -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 --git a/debian/zsh.postinst b/debian/zsh.postinst index 03b9e8a1c..3faa471f9 100644 --- a/debian/zsh.postinst +++ b/debian/zsh.postinst @@ -12,12 +12,6 @@ update-alternatives --remove rzsh /bin/zsh5 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 --git a/debian/zsh.postrm b/debian/zsh.postrm deleted file mode 100644 index d9cb0582e..000000000 --- a/debian/zsh.postrm +++ /dev/null @@ -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# |