From 007267fb430c8bcba8176e81f7f7a96015c9bad4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 15 Sep 2007 10:37:55 +0200 Subject: [PATCH] Pre-Depend on zsh [Testing: issue287] --- debian/changelog | 1 + debian/control | 3 ++- debian/preinst | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index db5c928..e96c0d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ grml-etc-core (0.3.24) unstable; urgency=low * /etc/zsh/zshrc: convert utf2iso and iso2utf into functions, Use 'command grep' (thanks to z3ttacht) and fix a small bug in iso2utf. + * Pre-Depend on zsh [Testing: issue287] -- Michael Prokop Sat, 15 Sep 2007 10:24:36 +0200 diff --git a/debian/control b/debian/control index aacbe0c..6aebe99 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ XS-Vcs-Browser: http://hg.grml.org/grml-etc-core/ Package: grml-etc-core Architecture: all Conflicts: grml-etc (<< 0.8-11), grml-autoconfig (<< 0.5-7), grml-scripts (<< 0.8-27) -Depends: editor | vim | nvi, zsh +Depends: editor | vim | nvi +Pre-Depends: zsh Description: core ecetera files for the grml system This package includes some /etc files for the grml system. Whereas the main grml-etc package is diff --git a/debian/preinst b/debian/preinst index 64f5164..06a7917 100755 --- a/debian/preinst +++ b/debian/preinst @@ -4,7 +4,7 @@ # 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: Mit Mär 21 19:03:31 CET 2007 [mika] +# Latest change: Sam Sep 15 10:36:46 CEST 2007 [mika] ################################################################################ set -e @@ -28,13 +28,14 @@ case "$1" in # we don't lose any files... for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \ /etc/zsh/zlogout /etc/vim/vimrc; do - [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$$" || /bin/true + [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$TMP" 2>/dev/null || /bin/true + # [ -e "$file".dpkg-new ] && cp -f "$file".dpkg-new "${file}.tmp.$TMP" backup_conffile $file && \ [ -f "$file" ] && rm $file && \ dpkg-divert --quiet --add --rename --package grml-etc-core --divert "$file".original $file && \ [ -f "$file".dpkg-bak ] && mv -f "$file".dpkg-bak "$file" [ -f "$file".grml-etc-core ] && mv -f "$file".grml-etc-core "$file" - [ -e "${file}.tmp.$$" ] && mv -f "${file}.tmp.$$" "$file.original" + [ -e "${file}.tmp.$TMP" ] && mv -f "${file}.tmp.$TMP" "$file.original" # trying to overwrite `/etc/skel/.zshrc', which is also in package zsh # [ -f /etc/skel/.zshrc ] && \ -- 2.1.4