r467 - trunk/vim/debian

[Stefano Zacchiroli]

Author: zack
Date: 2006-01-15 21:44:54 +0000 (Sun, 15 Jan 2006)
New Revision: 467

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/rules
   trunk/vim/debian/vim-gui-common.install
   trunk/vim/debian/vim-variant.postinst
   trunk/vim/debian/vim-variant.prerm
Log:
use alternatives to manage gvim separately from vim
only gui enabled variants now provide alternatives for gvim


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-01-15 18:47:12 UTC (rev 466)
+++ trunk/vim/debian/changelog	2006-01-15 21:44:54 UTC (rev 467)
@@ -1,3 +1,12 @@
+vim (1:6.4-006+3) UNRELEASED; urgency=low
+
+  [ Stefano Zacchiroli ]
+  * Handle /usr/bin/gvim with alternatives, so that it can be configured
+    to a vim executable with gui support when /usr/bin/vim is configured
+    to one with no such support. (closes: #345765)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 15 Jan 2006 22:20:50 +0100
+
 vim (1:6.4-006+2) unstable; urgency=low
 
   [ Norbert Tretkowski ]

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2006-01-15 18:47:12 UTC (rev 466)
+++ trunk/vim/debian/rules	2006-01-15 21:44:54 UTC (rev 467)
@@ -279,9 +279,9 @@
 	 # disabled, waiting for an update
 	 #cp debian/vim-install $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
-	 # gui symlinks
-	for n in evim eview gvim gview rgvim rgview gvimdiff; do \
-		ln -fs vim $(DESTDIR)/usr/bin/$$n; \
+	 # gui symlinks, except gvim which will be an alternative
+	for n in evim eview gview rgvim rgview gvimdiff; do \
+		ln -fs gvim $(DESTDIR)/usr/bin/$$n; \
 	done
 	ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink
 	 # console fonts

Modified: trunk/vim/debian/vim-gui-common.install
===================================================================
--- trunk/vim/debian/vim-gui-common.install	2006-01-15 18:47:12 UTC (rev 466)
+++ trunk/vim/debian/vim-gui-common.install	2006-01-15 21:44:54 UTC (rev 467)
@@ -2,7 +2,6 @@
 debian/tmp/usr/bin/evim		  usr/bin/
 debian/tmp/usr/bin/gview	  usr/bin/
 debian/tmp/usr/bin/gvimdiff	  usr/bin/
-debian/tmp/usr/bin/gvim		  usr/bin/
 debian/tmp/usr/bin/rgview	  usr/bin/
 debian/tmp/usr/bin/rgvim	  usr/bin/
 

Modified: trunk/vim/debian/vim-variant.postinst
===================================================================
--- trunk/vim/debian/vim-variant.postinst	2006-01-15 18:47:12 UTC (rev 466)
+++ trunk/vim/debian/vim-variant.postinst	2006-01-15 21:44:54 UTC (rev 467)
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#!/bin/bash -e
 
 pkg=@PKG@
 variant=@VARIANT@
@@ -10,22 +10,27 @@
 #    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() {
+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() {
+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() {
+add_variant_alternative () {
   update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
+  case "$variant" in
+    gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
+      update-alternatives --install /usr/bin/gvim gvim /usr/bin/vim.$variant $1
+      ;;
+  esac
 }
 
 replace_dir_w_symlink () {

Modified: trunk/vim/debian/vim-variant.prerm
===================================================================
--- trunk/vim/debian/vim-variant.prerm	2006-01-15 18:47:12 UTC (rev 466)
+++ trunk/vim/debian/vim-variant.prerm	2006-01-15 21:44:54 UTC (rev 467)
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#!/bin/bash -e
 
 pkg=@PKG@
 variant=@VARIANT@
@@ -8,12 +8,21 @@
 # 2) remove /usr/bin/gvim as an alternative for gnome-text-editor for
 #    variants built with gnome support
 
-remove_gnome_alternative() {
+remove_gnome_alternative () {
   if [ -f /usr/bin/gvim ]; then
     update-alternatives --remove gnome-text-editor /usr/bin/vim.$variant
   fi
 }
 
+remove_variant_alternative () {
+  update-alternatives --remove vim /usr/bin/vim.$variant
+  case "$variant" in
+    gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
+      update-alternatives --remove gvim /usr/bin/vim.$variant
+      ;;
+  esac
+}
+
 case "$1" in
   remove)
     case "$pkg" in
@@ -22,7 +31,7 @@
 	;;
     esac
     remove_gnome_alternative
-    update-alternatives --remove vim /usr/bin/vim.$variant
+    remove_variant_alternative
     ;;
 esac