r434 - trunk/vim/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-12-14 22:42:34 +0000 (Wed, 14 Dec 2005)
New Revision: 434

Removed:
   trunk/vim/debian/vim.postinst
Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/vim-variant.postinst
Log:
avoid empty /usr/share/doc/vim/ directory


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-12-14 22:40:09 UTC (rev 433)
+++ trunk/vim/debian/changelog	2005-12-14 22:42:34 UTC (rev 434)
@@ -10,6 +10,8 @@
     vim-common preinst phase. (closes: #343289)
   * debian/rules: finally found the karma of target-specific variables,
     hopefully the file is clearer now ...
+  * Fixed dangling manpage symlinks in vim-gui-common.
+    (closes: #343195, #343171)
 
  -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Tue, 13 Dec 2005 07:25:29 +0100
 

Modified: trunk/vim/debian/vim-variant.postinst
===================================================================
--- trunk/vim/debian/vim-variant.postinst	2005-12-14 22:40:09 UTC (rev 433)
+++ trunk/vim/debian/vim-variant.postinst	2005-12-14 22:42:34 UTC (rev 434)
@@ -28,6 +28,12 @@
   update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
 }
 
+replace_dir_w_symlink () {
+  if [ -d $1 -a ! -L $1 ]; then
+    (rmdir $1 && ln -fs $2 $1) || true
+  fi
+}
+
 case "$1" in
   configure)
     remove_old_diversion
@@ -37,6 +43,7 @@
 	;;
       vim)
 	add_variant_alternative 20
+	replace_dir_w_symlink /usr/share/doc/vim vim-common
 	;;
       vim-gtk|vim-lesstif)
 	add_variant_alternative 40

Deleted: trunk/vim/debian/vim.postinst
===================================================================
--- trunk/vim/debian/vim.postinst	2005-12-14 22:40:09 UTC (rev 433)
+++ trunk/vim/debian/vim.postinst	2005-12-14 22:42:34 UTC (rev 434)
@@ -1,61 +0,0 @@
-#! /bin/sh -e
-
-pkg=vim
-variant=basic
-
-# two things to do:
-# 1) add /usr/bin/vim.variant as alternative for /usr/bin/vim. Priority are
-#    chosen accordingly to the principle: ``more features, higher priority''
-# 2) add /usr/bin/gvim as an alternative for gnome-text-editor for variants
-#    built with gnome support. Same principle for the priority above, with the
-#    additional constraint that priority should not be higher than gedit's
-
-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
-}
-
-add_gnome_alternative() {
-  if [ -f /usr/bin/gvim ]; then
-    update-alternatives --install /usr/bin/gnome-text-editor \
-      gnome-text-editor /usr/bin/vim.$variant $1
-  fi
-}
-
-add_variant_alternative() {
-  update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
-}
-
-case "$1" in
-  configure)
-    remove_old_diversion
-    case "$pkg" in
-      vim-tiny)
-	add_variant_alternative 10
-	;;
-      vim)
-	add_variant_alternative 20
-	;;
-      vim-gtk|vim-lesstif)
-	add_variant_alternative 40
-	;;
-      vim-gnome) # gnome enabled variant
-	add_variant_alternative 40
-	add_gnome_alternative 40
-	;;
-      vim-perl|vim-python|vim-ruby|vim-tcl)
-	add_variant_alternative 50
-	;;
-      vim-full) # gnome enabled variant
-	add_variant_alternative 60
-	add_gnome_alternative 45
-	;;
-    esac
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0