From 47dfd78ee2038820cb9ab576d50984d892c4689f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 11 May 2008 10:56:05 +0200 Subject: [PATCH] No longer install zsh.vim --- debian/changelog | 3 ++- debian/postrm | 41 +++++++++++++++++------------------------ debian/preinst | 36 +++++++++++++++--------------------- debian/rules | 2 +- 4 files changed, 35 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 479a990..7192467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ zsh-lovers (0.7.1) unstable; urgency=low * Apply patch by Christian Schneider providing some further examples, thanks! + * No longer install zsh.vim. - -- Michael Prokop Sun, 28 Oct 2007 01:31:51 +0200 + -- Michael Prokop Sun, 11 May 2008 10:55:48 +0200 zsh-lovers (0.7.0) unstable; urgency=low diff --git a/debian/postrm b/debian/postrm index 798c73a..b750dfc 100755 --- a/debian/postrm +++ b/debian/postrm @@ -4,32 +4,25 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Jun 18 19:34:53 CEST 2005 [mika] +# Latest change: Son Mai 11 10:54:57 CEST 2008 [mika] ################################################################################ -set -e -TO_UNDIVERT="zsh.vim" -undivert_gen() { - DEXT=${3:-original} - dpkg-divert --remove --rename --package zsh-lovers \ - --divert $2/$1.$DEXT $2/$1 #> /dev/null -} - -case "$1" in - remove|purge) - for cmd in $TO_UNDIVERT; do - undivert_gen $cmd /usr/share/vim/syntax - done - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 -esac - -exit 0 +#set -e +# +#case "$1" in +# remove|purge) +# dpkg-divert --remove --rename --package zsh-lovers --divert /usr/share/vim/syntax/zsh.vim.original \ +# /usr/share/vim/syntax/zsh.vim +# ;; +# +# upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) +# ;; +# *) +# echo "postrm called with unknown argument \`$1'" >&2 +# exit 1 +#esac +# +#exit 0 ## END OF FILE ################################################################# diff --git a/debian/preinst b/debian/preinst index 113a239..2ccb69b 100755 --- a/debian/preinst +++ b/debian/preinst @@ -4,29 +4,23 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Jun 18 19:34:55 CEST 2005 [mika] +# Latest change: Son Mai 11 10:55:11 CEST 2008 [mika] ################################################################################ -set -e -TO_DIVERT="zsh.vim" -divert_gen() { - DEXT=${3:-original} - dpkg-divert --add --rename --package zsh-lovers \ - --divert $2/$1.$DEXT $2/$1 > /dev/null -} - -case "$1" in - install|upgrade) - for cmd in $TO_DIVERT; do - divert_gen $cmd /usr/share/vim/syntax - done - ;; - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 -esac - -exit 0 +#set -e +#case "$1" in +# install|upgrade) +# if [ -f /usr/share/vim/syntax/zsh.vim ] ; then +# dpkg-divert --add --rename --package zsh-lovers --divert /usr/share/vim/syntax/zsh.vim.original \ +# /usr/share/vim/syntax/zsh.vim >/dev/null +# fi +# ;; +# *) +# echo "preinst called with unknown argument \`$1'" >&2 +# exit 1 +#esac +# +#exit 0 ## END OF FILE ################################################################# diff --git a/debian/rules b/debian/rules index aab0ff2..abd4507 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ install: build dh_installdirs usr/share/doc/zsh-lovers/zsh_people usr/share/man/man1 usr/share/vim/syntax # cp -a zsh_people debian/zsh-lovers/usr/share/doc/zsh-lovers/ - install -m 644 zsh.vim debian/zsh-lovers/usr/share/vim/syntax/zsh.vim + # install -m 644 zsh.vim debian/zsh-lovers/usr/share/vim/syntax/zsh.vim binary-indep: build install # We have nothing to do -- 2.1.4