[SCM] Vim packaging branch, debian, updated. upstream/7.2b.001-223-g0825719

[James Vega]

The following commit has been merged in the debian branch:
commit c1408e4f49c0a49c04fbe4921c400459c43ea39c
Author: James Vega <jamessan at debian.org>
Date:   Tue Aug 5 18:49:33 2008 -0400

    Use proper invocation of dpkg-divert when removing diversions.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/vim-runtime.preinst.in b/debian/vim-runtime.preinst.in
index acc3761..8a83c2c 100644
--- a/debian/vim-runtime.preinst.in
+++ b/debian/vim-runtime.preinst.in
@@ -3,6 +3,10 @@ set -e
 
 basedir=/usr/share/vim/@VIMCUR@/doc
 
+rm_diversion() {
+  dpkg-divert --package vim-runtime --rename --remove "$1"
+}
+
 add_diversion() {
   dpkg-divert --package vim-runtime --add --rename \
     --divert "$1.vim-tiny" "$1"
@@ -14,7 +18,7 @@ remove_previous_diversions() {
   for v in vim71 vim72a; do
     oldpath="$(echo $1 | sed s/@VIMCUR@/$v/)"
     if dpkg-divert --list 2>/dev/null | grep -q "$oldpath"; then
-      dpkg-divert --remove --rename $oldpath
+      rm_diversion $oldpath
     fi
   done
 }

-- 
Vim packaging