r420 - trunk/vim/debian

Stefano Zacchiroli zack at costa.debian.org
Thu Dec 1 22:06:34 UTC 2005


Author: zack
Date: 2005-12-01 22:06:33 +0000 (Thu, 01 Dec 2005)
New Revision: 420

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/vim-variant.postinst
   trunk/vim/debian/vim-variant.postrm
   trunk/vim/debian/vim.postinst
   trunk/vim/debian/vim.postrm
Log:
moved removal of old vim.org diversion to postinst instead of postrm
(don't know why it was there ..., a mistake of mine probably)


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-12-01 17:21:44 UTC (rev 419)
+++ trunk/vim/debian/changelog	2005-12-01 22:06:33 UTC (rev 420)
@@ -24,6 +24,8 @@
   * No longer try to move configuration files from /etc to /etc/vim
     (ancient preinst, no longer needed to support upgrades from sarge).
   * Updated Description-s in debian/control.
+  * Check for and removal of old vim.org diversion in postinst instead
+    of postrm (closes: #341081)
 
   [ James Vega ]
   * Added patch 148_debchangelog, update syntax/debchangelog.vim to

Modified: trunk/vim/debian/vim-variant.postinst
===================================================================
--- trunk/vim/debian/vim-variant.postinst	2005-12-01 17:21:44 UTC (rev 419)
+++ trunk/vim/debian/vim-variant.postinst	2005-12-01 22:06:33 UTC (rev 420)
@@ -4,8 +4,16 @@
 variant=@VARIANT@
 prio=0
 
+remove_old_diversion() {
+  if [ -f /usr/bin/vim.org ]; then
+    dpkg-divert --package $pkg --remove --rename \
+              --divert /usr/bin/vim.org /usr/bin/vim
+  fi
+}
+
 case "$1" in
   configure)
+    remove_old_diversion
     case "$pkg" in
       vim-tiny)
 	prio=10

Modified: trunk/vim/debian/vim-variant.postrm
===================================================================
--- trunk/vim/debian/vim-variant.postrm	2005-12-01 17:21:44 UTC (rev 419)
+++ trunk/vim/debian/vim-variant.postrm	2005-12-01 22:06:33 UTC (rev 420)
@@ -2,19 +2,6 @@
 
 pkg=@PKG@
 
-remove_old_diversion() {
-  if [ -f /usr/bin/vim.org ]; then
-    dpkg-divert --package $pkg --remove --rename \
-              --divert /usr/bin/vim.org /usr/bin/vim
-  fi
-}
-
-if [ "$1" = "failed-upgrade" ] && $(dpkg --compare-versions $2 lt 6.0) ; then
-  remove_old_diversion
-elif [ "$1" = "remove" ] ; then
-  remove_old_diversion
-fi
-
 #DEBHELPER#
 
 exit 0

Modified: trunk/vim/debian/vim.postinst
===================================================================
--- trunk/vim/debian/vim.postinst	2005-12-01 17:21:44 UTC (rev 419)
+++ trunk/vim/debian/vim.postinst	2005-12-01 22:06:33 UTC (rev 420)
@@ -4,8 +4,16 @@
 variant=basic
 prio=0
 
+remove_old_diversion() {
+  if [ -f /usr/bin/vim.org ]; then
+    dpkg-divert --package $pkg --remove --rename \
+              --divert /usr/bin/vim.org /usr/bin/vim
+  fi
+}
+
 case "$1" in
   configure)
+    remove_old_diversion
     case "$pkg" in
       vim-tiny)
 	prio=10
@@ -23,8 +31,7 @@
         prio=60
 	;;
     esac
-    update-alternatives \
-      --install /usr/bin/vim vim /usr/bin/vim.$variant $prio
+    update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $prio
     ;;
 esac
 

Modified: trunk/vim/debian/vim.postrm
===================================================================
--- trunk/vim/debian/vim.postrm	2005-12-01 17:21:44 UTC (rev 419)
+++ trunk/vim/debian/vim.postrm	2005-12-01 22:06:33 UTC (rev 420)
@@ -2,19 +2,6 @@
 
 pkg=vim
 
-remove_old_diversion() {
-  if [ -f /usr/bin/vim.org ]; then
-    dpkg-divert --package $pkg --remove --rename \
-              --divert /usr/bin/vim.org /usr/bin/vim
-  fi
-}
-
-if [ "$1" = "failed-upgrade" ] && $(dpkg --compare-versions $2 lt 6.0) ; then
-  remove_old_diversion
-elif [ "$1" = "remove" ] ; then
-  remove_old_diversion
-fi
-
 #DEBHELPER#
 
 exit 0




More information about the pkg-vim-maintainers mailing list