r819 - in /trunk/packages/vim/debian: changelog vim-variant.preinst

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Thu Jan  4 21:18:15 2007
New Revision: 819

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=819
Log:
Remove the russian man page alternatives in order to allow a clean upgrade from Etch.

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/vim-variant.preinst

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=819&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jan  4 21:18:15 2007
@@ -1,11 +1,15 @@
-vim (1:7.0-164+2) unstable; urgency=high
+vim (1:7.0-164+2) unstable; urgency=medium
 
   [ James Vega ]
-  * Move diversion removal back to vim-variant.preinst.  Manually remove
-    /usr/bin/vim in order to be able to remove the diversion.  Fixes upgrades
-    from Etch leaving behind stale binaries.  (closes: #401000)
-
- -- James Vega <jamessan at debian.org>  Wed,  3 Jan 2007 21:58:53 -0500
+  * debian/vim-variant.preinst:
+    + Move diversion removal here from vim-variant.postinst.  Manually remove
+      /usr/bin/vim in order to be able to remove the diversion.  Fixes
+      upgrades from Sarge leaving behind stale binaries.  (closes: #401000)
+    + Remove the alternatives for ru.{UTF-8,KOI8-R} manpages so the
+      alternatives system doesn't attempt to keep the links around after the
+      upgrade.  Fixes upgrades from Etch.  (closes: #399024)
+
+ -- James Vega <jamessan at debian.org>  Thu,  4 Jan 2007 01:50:25 -0500
 
 vim (1:7.0-164+1) unstable; urgency=low
 
@@ -19,8 +23,10 @@
     - Remove tags file in vim-runtime's postrm
   * Add Provides: editor to the gvim variants.  (closes: #398572)
   * Remove the empty vim-variant.postrm.
-
- -- James Vega <jamessan at debian.org>  Tue, 14 Nov 2006 23:02:19 -0500
+  * Move the Russian KOI8-R man pages to /usr/share/man/ru/man1 and remove the
+    utf8 man pages.  man will handle the conversion.  (closes: #368754)
+
+ -- James Vega <jamessan at debian.org>  Wed, 15 Nov 2006 08:48:51 -0500
 
 vim (1:7.0-158+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/debian/vim-variant.preinst
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.preinst?rev=819&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.preinst (original)
+++ trunk/packages/vim/debian/vim-variant.preinst Thu Jan  4 21:18:15 2007
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 pkg=@PKG@
+variant=@VARIANT@
 
 remove_directory () {
   if [ -d $1 ]; then
@@ -20,10 +21,17 @@
   fi
 }
 
+remove_variant_alternative () {
+  for i in vi view ex editor; do
+    update-alternatives --remove $i /usr/bin/vim.$variant
+  done
+}
+
 case "$1" in
   upgrade)
     remove_old_diversion
     remove_directory /usr/share/doc/$pkg
+    [ -e /usr/share/man/ru.UTF-8/man1/view.1.gz ] && remove_variant_alternative
     ;;
 esac