[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-1043-ga66ad6b

[James Vega]

The following commit has been merged in the debian branch:
commit 7489ef5562d651cfb8890a9d0892017485076c3c
Author: James Vega <jamessan at debian.org>
Date:   Wed Jul 1 19:03:47 2009 -0400

    vim-variant.prerm: Cleanup of mis-handled alternatives is no longer needed
    
    The switch to alternatives happened in Etch and mis-handled alternatives were
    fixed when upgrading to Lenny.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/vim-variant.prerm b/debian/vim-variant.prerm
index 757c853..5f7e33e 100644
--- a/debian/vim-variant.prerm
+++ b/debian/vim-variant.prerm
@@ -8,26 +8,14 @@ variant=@VARIANT@
 # 2) remove /usr/bin/gvim as an alternative for gnome-text-editor for
 #    variants built with gnome support
 
-# check_and_remove_alternative cleans up stale alternatives that were left
-# behind from previous mishandling of alternatives.
-check_and_remove_alternative () {
-  if update-alternatives --list $1 | grep -q bin/vim; then
-    for f in `update-alternatives --list $1 | grep 'bin/vim$'`; do
-      update-alternatives --remove $1 $f
-    done
-  fi
-}
-
 remove_gnome_alternative () {
   if [ -f /usr/bin/vim.$variant ]; then
-    check_and_remove_alternative gnome-text-editor
     update-alternatives --remove gnome-text-editor /usr/bin/vim.$variant
   fi
 }
 
 remove_variant_alternative () {
   for i in vi view ex editor rvim rview vimdiff vim; do
-    check_and_remove_alternative $i
     update-alternatives --remove $i /usr/bin/vim.$variant
   done
   case "$variant" in
@@ -39,7 +27,6 @@ remove_variant_alternative () {
 
 remove_gui_variant_alternative () {
   for i in eview evim gview gvimdiff rgview rgvim gvim; do
-    check_and_remove_alternative $i
     update-alternatives --remove $i /usr/bin/vim.$variant
   done
 }

-- 
Vim packaging