diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/zsh-static.lintian-overrides | 2 | ||||
| -rwxr-xr-x | debian/zsh.bug-script | 40 | ||||
| -rw-r--r-- | debian/zsh.lintian-overrides | 2 |
5 files changed, 47 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 4ea63fc83..c8c551f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,18 @@ zsh (5.0.5-dev-1-1) UNRELEASED; urgency=medium -- Axel Beckert <abe@debian.org> Mon, 11 Aug 2014 20:22:29 +0200 +zsh (5.0.5-4) unstable; urgency=medium + + * [5cebe890] Fix output file descriptor of bug script. reportbug + only captures output to fd 3 and ignores STDOUT. + * [11486424] Simplify helpfiles generation in debian/rules. + + nroff is no more called twice (Closes: #737582) + + There's no more need to replace any ISO Latin-1 character. + + debian/rules is now pure 7-bit ASCII again + * [d1d4dabe] Add lintian overrides for spelling error false positives. + + -- Axel Beckert <abe@debian.org> Sat, 28 Jun 2014 17:37:54 +0200 + zsh (5.0.5-3) unstable; urgency=medium [ Axel Beckert ] diff --git a/debian/rules b/debian/rules index 4693cea4e..0baeab34e 100755 --- a/debian/rules +++ b/debian/rules @@ -101,9 +101,7 @@ binary-indep: build-indep binary-arch-dynamic dh_installdirs -i cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh-common - nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \ - sed -e 's/±/{+|-}/' | \ - perl $(CURDIR)/Util/helpfiles /dev/stdin debian/zsh-common/usr/share/zsh/help + perl $(CURDIR)/Util/helpfiles Doc/zshbuiltins.1 debian/zsh-common/usr/share/zsh/help # functions dh_installexamples -pzsh-common -X.distfiles diff --git a/debian/zsh-static.lintian-overrides b/debian/zsh-static.lintian-overrides index 21a0ecb14..91d63bf29 100644 --- a/debian/zsh-static.lintian-overrides +++ b/debian/zsh-static.lintian-overrides @@ -1,3 +1,5 @@ zsh-static: embedded-library bin/zsh5-static: libm zsh-static: embedded-library bin/zsh5-static: ncurses zsh-static: package-contains-broken-symlink usr/share/man/man1/zsh5-static.1.gz zsh.1.gz +# False positive +zsh-static: spelling-error-in-binary bin/zsh5-static tEH the diff --git a/debian/zsh.bug-script b/debian/zsh.bug-script index 026625c85..5296c4e77 100755 --- a/debian/zsh.bug-script +++ b/debian/zsh.bug-script @@ -1,19 +1,39 @@ #!/bin/sh +exec 1>&3 +exec 2>&3 + +list_packages() { + text="$1" + shift + if [ -n "$1" ]; then + printf "$text:\n\n" + dpkg-query -l "$@" + if [ -x /usr/bin/debsums ]; then + FILES="$(debsums -ce "$@")" + if [ -n "$FILES" ]; then + printf "\nThe following files were modified:\n\n$FILES\n" + fi + fi + fi + printf "\n" +} + if [ -x /usr/bin/aptitude ]; then - echo "*** Packages which depend, recommend, suggest or enhance a zsh package and hence may provide code meant to be sourced in .zshrc ***" - aptitude -q search '( ?enhances(?name(^zsh)) | ?depends(?name(^zsh)) | ?recommends(?name(^zsh)) | ?suggests(?name(^zsh)) ) !?source-package(^zsh$) ~i' + TEXT="Packages which depend, recommend, suggest or enhance a zsh package and hence may provide code meant to be sourced in .zshrc" + PKGS=$(aptitude -q -F '%p' search '( ?enhances(?name(^zsh)) | ?depends(?name(^zsh)) | ?recommends(?name(^zsh)) | ?suggests(?name(^zsh)) ) !?source-package(^zsh$) ~i') else - echo "*** Packages which provide code meant to be sourced in .zshrc ***" + TEXT="Packages which provide code meant to be sourced in .zshrc" # Hardcoded list of (future) packages containing code meant to be # sourced in .zshrc - dpkg-query -l fizsh oh-my-zsh zsh-antigen autojump zec 'grml-*' + PKGS=$(dpkg-query -W -f '${Package}\n' fizsh oh-my-zsh zsh-antigen autojump zec 'grml-*' 2>/dev/null) fi -echo "" -echo "*** Packages which provide vendor completions ***" -dpkg-query -S /usr/share/zsh/vendor-completions/ | awk -F: '{print $1}' | sed -e 's/,//g' | xargs -r dpkg-query -l +list_packages "$TEXT" $PKGS + +list_packages "Packages which provide vendor completions" \ +$(dpkg-query -S /usr/share/zsh/vendor-completions/ | awk -F: '{print $1}' | sed -e 's/,//g') + +list_packages "Packages which provide vendor functions" \ +$(dpkg-query -S /usr/share/zsh/vendor-functions/ | awk -F: '{print $1}' | sed -e 's/,//g') -echo "" -echo "*** Packages which provide vendor functions ***" -dpkg-query -S /usr/share/zsh/vendor-functions/ | awk -F: '{print $1}' | sed -e 's/,//g' | xargs -r dpkg-query -l diff --git a/debian/zsh.lintian-overrides b/debian/zsh.lintian-overrides index f23c6a12c..5cbb27ba2 100644 --- a/debian/zsh.lintian-overrides +++ b/debian/zsh.lintian-overrides @@ -1,2 +1,4 @@ # Only one of many files affected -> likely a false positive zsh: hardening-no-fortify-functions usr/lib*/zsh/*/zsh/zleparameter.so +# False positive +zsh: spelling-error-in-binary usr/lib/*/zsh/*/zsh/zle.so tEH the |