Author: jamessan
Date: 2006-02-04 17:24:29 +0000 (Sat, 04 Feb 2006)
New Revision: 486
Removed:
trunk/vim/debian/vim-gui-common.manpages
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/rules
trunk/vim/debian/vim-common.install
trunk/vim/debian/vim-gui-common.dirs
trunk/vim/debian/vim-gui-common.install
trunk/vim/debian/vim-variant.postinst
trunk/vim/debian/vim-variant.prerm
Log:
Removed all binaries except xxd from vim-common. Handle the rest by using
alternatives in the vim-variant's package.
Change vim-gui-common to Arch: all since there aren't any architecture
dependent files.
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-01-30 04:05:01 UTC (rev 485)
+++ trunk/vim/debian/changelog 2006-02-04 17:24:29 UTC (rev 486)
@@ -18,8 +18,11 @@
alternatives. Move update-alternatives handling out of vim-common.
(closes: #348233)
* Add 'armeb' to debcontrol syntax file. (closes: #350513)
+ * Remove all binaries except xxd from vim-common. Handle the rest with
+ alternatives in the variant packages.
+ * debian/control: Changed vim-gui-common to Arch: all
- -- James Vega <jamessan@xxxxxxxxxx> Sun, 29 Jan 2006 23:03:10 -0500
+ -- <jamessan@xxxxxxxxxx> Sat, 4 Feb 2006 12:22:15 -0500
vim (1:6.4-006+2) unstable; urgency=low
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2006-01-30 04:05:01 UTC (rev 485)
+++ trunk/vim/debian/control 2006-02-04 17:24:29 UTC (rev 486)
@@ -27,7 +27,7 @@
Package: vim-gui-common
Priority: optional
-Architecture: any
+Architecture: all
Depends: vim-common (= ${Source-Version})
Conflicts: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<<
1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3),
vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<<
1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Replaces: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<<
1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3),
vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<<
1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2006-01-30 04:05:01 UTC (rev 485)
+++ trunk/vim/debian/rules 2006-02-04 17:24:29 UTC (rev 486)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#!/usr/bin/make -f
export SHELL=/bin/bash
export DH_OPTIONS
@@ -280,16 +280,13 @@
# disabled, waiting for an update
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
- # 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
install -D $(VIMCUR)/farsi/fonts/UNIXs/far-a01.pcf.gz \
$(DESTDIR)/usr/share/consolefonts/far-a01.pcf.gz
- rm -f $(DESTDIR)/usr/bin/{ex,view} # rm stuff handled by alternatives
- rm -f $(DESTDIR)/usr/share/man/man1/{ex,view}.1
+ # rm stuff handled by alternatives
+ rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
+ rm -f $(DESTDIR)/usr/share/man/man1/{ex,view,rvim,rview}.1
# rm C part of maze (no longer working)
rm -f $(DESTDIR)/usr/share/vim/vimcurrent/macros/maze/{*.c,Makefile}
# fix for CAN-2005-0069
Modified: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install 2006-01-30 04:05:01 UTC (rev 485)
+++ trunk/vim/debian/vim-common.install 2006-02-04 17:24:29 UTC (rev 486)
@@ -1,6 +1,3 @@
-debian/tmp/usr/bin/rview usr/bin/
-debian/tmp/usr/bin/rvim usr/bin/
-debian/tmp/usr/bin/vimdiff usr/bin/
debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/runtime/vimrc etc/vim/
Modified: trunk/vim/debian/vim-gui-common.dirs
===================================================================
--- trunk/vim/debian/vim-gui-common.dirs 2006-01-30 04:05:01 UTC (rev
485)
+++ trunk/vim/debian/vim-gui-common.dirs 2006-02-04 17:24:29 UTC (rev
486)
@@ -2,3 +2,4 @@
/usr/bin/
/usr/share/applications/
/usr/share/pixmaps/
+/usr/share/man/man1
Modified: trunk/vim/debian/vim-gui-common.install
===================================================================
--- trunk/vim/debian/vim-gui-common.install 2006-01-30 04:05:01 UTC (rev
485)
+++ trunk/vim/debian/vim-gui-common.install 2006-02-04 17:24:29 UTC (rev
486)
@@ -1,10 +1,3 @@
-debian/tmp/usr/bin/eview usr/bin/
-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/rgview usr/bin/
-debian/tmp/usr/bin/rgvim usr/bin/
-
debian/gvim.desktop usr/share/applications/
debian/icons/* usr/share/pixmaps/
debian/runtime/gvimrc etc/vim/
Deleted: trunk/vim/debian/vim-gui-common.manpages
===================================================================
--- trunk/vim/debian/vim-gui-common.manpages 2006-01-30 04:05:01 UTC (rev
485)
+++ trunk/vim/debian/vim-gui-common.manpages 2006-02-04 17:24:29 UTC (rev
486)
@@ -1 +0,0 @@
-debian/manpage/*
Modified: trunk/vim/debian/vim-variant.postinst
===================================================================
--- trunk/vim/debian/vim-variant.postinst 2006-01-30 04:05:01 UTC (rev
485)
+++ trunk/vim/debian/vim-variant.postinst 2006-02-04 17:24:29 UTC (rev
486)
@@ -2,6 +2,7 @@
pkg=@PKG@
variant=@VARIANT@
+mandir=/usr/share/man/man1
# two things to do:
# 1) add /usr/bin/vim.variant as alternative for /usr/bin/vim. Priority are
@@ -26,18 +27,36 @@
add_variant_alternative () {
update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
- for i in vi view ex editor ; do
+ update-alternatives --install /usr/bin/vimdiff vimdiff /usr/bin/vim $1
+ for i in vi view ex editor rvim rview ; do
update-alternatives \
--install /usr/bin/$i $i /usr/bin/vim $1 \
- --slave /usr/share/man/man1/$i.1.gz $i.1.gz /usr/share/man/man1/vim.1.gz
+ --slave $mandir/$i.1.gz $i.1.gz $mandir/vim.1.gz
done
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
+ add_gui_variant_alternative $1
;;
esac
}
+add_gui_variant_alternative () {
+ update-alternatives --install /usr/bin/gvim gvim /usr/bin/vim.$variant $1
+ for i in gview rgview rgvim ; do
+ update-alternatives \
+ --install /usr/bin/$i $i /usr/bin/gvim $1 \
+ --slave $mandir/$i.1.gz $i.1.gz $mandir/vim.1.gz
+ done
+ # Handle evim/eview and gvimdiff separately since they have different man
+ # pages
+ for i in evim gvimdiff ; do
+ update-alternatives \
+ --install /usr/bin/$i $i /usr/bin/gvim $1
+ done
+ update-alternatives --install /usr/bin/eview eview /usr/bin/gvim $1 \
+ --slave $mandir/eview.1.gz eview.1.gz $mandir/evim.1.gz
+}
+
replace_dir_w_symlink () {
if [ -d $1 -a ! -L $1 ]; then
(rmdir $1 && ln -fs $2 $1) || true
Modified: trunk/vim/debian/vim-variant.prerm
===================================================================
--- trunk/vim/debian/vim-variant.prerm 2006-01-30 04:05:01 UTC (rev 485)
+++ trunk/vim/debian/vim-variant.prerm 2006-02-04 17:24:29 UTC (rev 486)
@@ -3,8 +3,12 @@
pkg=@PKG@
variant=@VARIANT@
+# Order is important for 1). If 1a) and 1b) are swapped, there will be stale
+# alternatives left behind on the system
# two things to do:
# 1) remove /usr/bin/vim.variant as alternative for /usr/bin/vim
+# 1a) first remove alternatives that link to /usr/bin/(g)vim
+# 1b) then remove /usr/bin/(g)vim alternative
# 2) remove /usr/bin/gvim as an alternative for gnome-text-editor for
# variants built with gnome support
@@ -15,17 +19,24 @@
}
remove_variant_alternative () {
- update-alternatives --remove vim /usr/bin/vim.$variant
- for i in vi view ex editor ; do
+ for i in vi view ex editor rvim rview vimdiff ; do
update-alternatives --remove $i /usr/bin/vim
done
+ 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
+ remove_gui_variant_alternative
;;
esac
}
+remove_gui_variant_alternative () {
+ for i in eview evim gview gvimdiff rgview rgvim ; do
+ update-alternatives --remove $i /usr/bin/gvim
+ done
+ update-alternatives --remove gvim /usr/bin/vim.$variant
+}
+
case "$1" in
remove)
case "$pkg" in
@@ -33,7 +44,6 @@
remove_gnome_alternative
;;
esac
- remove_gnome_alternative
remove_variant_alternative
;;
esac
|
