[Pkg-zsh-commits] [zsh] 02/02: Remove pre-#768937 legacy code from zsh{, -dev, -dbg, -doc}.postinst
Axel Beckert
abe at deuxchevaux.org
Sun Aug 30 22:16:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch debian
in repository zsh.
commit 6fad76ca6e5b9e90ab8f085586909893471ba246
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun Aug 30 23:24:21 2015 +0200
Remove pre-#768937 legacy code from zsh{,-dev,-dbg,-doc}.postinst
Thanks to lintian for making me aware of this via its (experimental)
maintainer-script-may-use-dir_to_symlink_helper warning.
Actually these (now removed) code snippets did even the opposite of
what is defined in debian/*.maintscript for the according arch:any
packages. Either the failing rmdir saved us from the symlink being set
or the debian/*.maintscript generated snippets coming after the now
removed snippets fixed it just immediately again.
The only arch:all package in this list is zsh-doc which still has a
symlink /usr/share/doc/zsh-doc to zsh-common. But since this change
(in 5.0.2-3) predates Jessie as well as Trusty, we should be able to
safely remove that code now anyways.
If for some reason, this commit is starting troubles with zsh-doc
upgrades, you might want to add a file named
debian/zsh-doc.maintscript to the source package and put this single
line (without the leading spaces) into it:
dir_to_symlink /usr/share/doc/zsh-doc zsh-common 5.0.2-3~
This line is untested though.
---
debian/zsh-dbg.postinst | 8 --------
debian/zsh-dev.postinst | 8 --------
debian/zsh-doc.postinst | 8 --------
debian/zsh.postinst | 8 --------
4 files changed, 32 deletions(-)
diff --git a/debian/zsh-dbg.postinst b/debian/zsh-dbg.postinst
index dac01ba..0bd46c1 100644
--- a/debian/zsh-dbg.postinst
+++ b/debian/zsh-dbg.postinst
@@ -15,14 +15,6 @@ case "$1" in
;;
esac
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dbg"
-if [ -d $docdir -a ! -L $docdir ]; then
- if rmdir $docdir 2>/dev/null; then
- ln -sf zsh-common $docdir
- fi
-fi
-
#DEBHELPER#
exit 0
diff --git a/debian/zsh-dev.postinst b/debian/zsh-dev.postinst
index 60ce48d..0bd46c1 100644
--- a/debian/zsh-dev.postinst
+++ b/debian/zsh-dev.postinst
@@ -15,14 +15,6 @@ case "$1" in
;;
esac
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dev"
-if [ -d $docdir -a ! -L $docdir ]; then
- if rmdir $docdir 2>/dev/null; then
- ln -sf zsh-common $docdir
- fi
-fi
-
#DEBHELPER#
exit 0
diff --git a/debian/zsh-doc.postinst b/debian/zsh-doc.postinst
index df10e1e..0bd46c1 100644
--- a/debian/zsh-doc.postinst
+++ b/debian/zsh-doc.postinst
@@ -15,14 +15,6 @@ case "$1" in
;;
esac
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-doc"
-if [ -d $docdir -a ! -L $docdir ]; then
- if rmdir $docdir 2>/dev/null; then
- ln -sf zsh-common $docdir
- fi
-fi
-
#DEBHELPER#
exit 0
diff --git a/debian/zsh.postinst b/debian/zsh.postinst
index 92a2300..2ba2202 100644
--- a/debian/zsh.postinst
+++ b/debian/zsh.postinst
@@ -28,14 +28,6 @@ update-alternatives --install /bin/rzsh rzsh /bin/zsh5 51 \
update-alternatives --remove zsh /bin/zsh4
update-alternatives --remove rzsh /bin/zsh4
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh"
-if [ -d $docdir -a ! -L $docdir ]; then
- if rmdir $docdir 2>/dev/null; then
- ln -sf zsh-common $docdir
- fi
-fi
-
#DEBHELPER#
exit 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git
More information about the Pkg-zsh-commits
mailing list