r521 - trunk/vim7/debian
James Vega
jamessan at costa.debian.org
Sat Mar 25 22:57:16 UTC 2006
Author: jamessan
Date: 2006-03-25 22:57:15 +0000 (Sat, 25 Mar 2006)
New Revision: 521
Modified:
trunk/vim7/debian/rules
trunk/vim7/debian/vim-common.links
trunk/vim7/debian/vim-gui-common.links
trunk/vim7/debian/vim-variant.postinst
trunk/vim7/debian/vim-variant.prerm
Log:
Update alternatives/manpage handling.
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2006-03-25 22:52:47 UTC (rev 520)
+++ trunk/vim7/debian/rules 2006-03-25 22:57:15 UTC (rev 521)
@@ -13,8 +13,10 @@
CFLAGS+=-O2
endif
-ifneq (,$(findstring test,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
MAKETEST = yes
+else
+ MAKETEST = no
endif
INSTALL+=install
@@ -160,7 +162,7 @@
NAME=vim
VERSION=7.0aa
-SNAPSHOT=0222
+SNAPSHOT=0232
DEBVERSION=6.4+$(VERSION).$(SNAPSHOT)
SRCDIR=$(NAME)$(subst .,,$(VERSION))
VIMCUR=$(SRCDIR)
@@ -171,6 +173,7 @@
SOURCES = vim-7.$(SNAPSHOT).zip
BASE_URL=ftp://ftp.vim.org/pub/vim
PER_VARIANT_FILES = install postinst postrm prerm links
+LANGS=fr fr.ISO8859-1 fr.UTF-8 it it.ISO8859-1 it.UTF-8 ru.KOI8-R ru.UTF-8
# nothing to do per default
all:
@@ -287,7 +290,7 @@
installtools \
install-icons \
install-languages
- if [ "X$(MAKETEST)" = "Xyes" ]; then \
+ if [ $(MAKETEST) = "yes" ]; then \
$(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) test; \
fi
@@ -297,9 +300,9 @@
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink
- # rm stuff handled by alternatives
- #rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
- @for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name rview.1 -o -name rvim.1 -o -name ex.1`; do \
+ # rm stuff handled by alternatives
+ rm -f $(DESTDIR)/usr/bin/{ex,view}
+ @for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
rm -f $$f; \
done
# rm C part of maze (no longer working)
@@ -323,13 +326,23 @@
dh_installman
dh_install -X.svn --fail-missing
- # remove things that are in vim-gui-common
- @for f in `find debian/vim-common -name evim.1`; do \
- rm -f $$f; \
+ # adjust things for vim-gui-common
+ cp debian/vim-common/usr/share/man/man1/vim.1 \
+ debian/vim-gui-common/usr/share/man/man1/gvim.1
+ cp debian/vim-common/usr/share/man/man1/vimdiff.1 \
+ debian/vim-gui-common/usr/share/man/man1/gvimdiff.1
+ rm -f debian/vim-common/usr/share/man/man1/evim.1
+ @for L in $(LANGS); do \
+ cp debian/vim-common/usr/share/man/$$L/man1/vim.1 \
+ debian/vim-gui-common/usr/share/man/$$L/man1/gvim.1; \
+ cp debian/vim-common/usr/share/man/$$L/man1/vimdiff.1 \
+ debian/vim-gui-common/usr/share/man/$$L/man1/gvimdiff.1; \
+ rm -f debian/vim-common/usr/share/man/$$L/man1/evim.1; \
done
# remove things that are in vim-runtime
- @for f in `find debian/vim-common -name vimtutor.1`; do \
- rm -f $$f; \
+ rm -f debian/vim-common/usr/share/man/man1/vimtutor.1
+ @for L in $(LANGS); do \
+ rm -f debian/vim-common/usr/share/man/$$L/man1/vimtutor.1; \
done
rmdir debian/vim-gui-common/usr/bin
dh_link
Modified: trunk/vim7/debian/vim-common.links
===================================================================
--- trunk/vim7/debian/vim-common.links 2006-03-25 22:52:47 UTC (rev 520)
+++ trunk/vim7/debian/vim-common.links 2006-03-25 22:57:15 UTC (rev 521)
@@ -1,2 +1,29 @@
etc/vim usr/share/vim/vimfiles
etc/vim/vimrc usr/share/vim/vimrc
+
+usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1
+usr/share/man/man1/vim.1 usr/share/man/man1/rview.1
+
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rvim.1
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rview.1
+
+usr/share/man/fr.ISO8859-1/man1/vim.1 usr/share/man/fr.ISO8859-1/man1/rvim.1
+usr/share/man/fr.ISO8859-1/man1/vim.1 usr/share/man/fr.ISO8859-1/man1/rview.1
+
+usr/share/man/fr.UTF-8/man1/vim.1 usr/share/man/fr.UTF-8/man1/rvim.1
+usr/share/man/fr.UTF-8/man1/vim.1 usr/share/man/fr.UTF-8/man1/rview.1
+
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rvim.1
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rview.1
+
+usr/share/man/it.ISO8859-1/man1/vim.1 usr/share/man/it.ISO8859-1/man1/rvim.1
+usr/share/man/it.ISO8859-1/man1/vim.1 usr/share/man/it.ISO8859-1/man1/rview.1
+
+usr/share/man/it.UTF-8/man1/vim.1 usr/share/man/it.UTF-8/man1/rvim.1
+usr/share/man/it.UTF-8/man1/vim.1 usr/share/man/it.UTF-8/man1/rview.1
+
+usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rvim.1
+usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rview.1
+
+usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rvim.1
+usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rview.1
Modified: trunk/vim7/debian/vim-gui-common.links
===================================================================
--- trunk/vim7/debian/vim-gui-common.links 2006-03-25 22:52:47 UTC (rev 520)
+++ trunk/vim7/debian/vim-gui-common.links 2006-03-25 22:57:15 UTC (rev 521)
@@ -1,2 +1,47 @@
etc/vim/gvimrc usr/share/vim/gvimrc
usr/share/doc/vim-common usr/share/doc/vim-gui-common
+
+usr/share/man/man1/gvim.1 usr/share/man/man1/gview.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgvim.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgview.1
+usr/share/man/man1/evim.1 usr/share/man/man1/eview.1
+
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/gview.1
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/rgvim.1
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/rgview.1
+usr/share/man/fr/man1/evim.1 usr/share/man/fr/man1/eview.1
+
+usr/share/man/fr.ISO8859-1/man1/gvim.1 usr/share/man/fr.ISO8859-1/man1/gview.1
+usr/share/man/fr.ISO8859-1/man1/gvim.1 usr/share/man/fr.ISO8859-1/man1/rgvim.1
+usr/share/man/fr.ISO8859-1/man1/gvim.1 usr/share/man/fr.ISO8859-1/man1/rgview.1
+usr/share/man/fr.ISO8859-1/man1/evim.1 usr/share/man/fr.ISO8859-1/man1/eview.1
+
+usr/share/man/fr.UTF-8/man1/gvim.1 usr/share/man/fr.UTF-8/man1/gview.1
+usr/share/man/fr.UTF-8/man1/gvim.1 usr/share/man/fr.UTF-8/man1/rgvim.1
+usr/share/man/fr.UTF-8/man1/gvim.1 usr/share/man/fr.UTF-8/man1/rgview.1
+usr/share/man/fr.UTF-8/man1/evim.1 usr/share/man/fr.UTF-8/man1/eview.1
+
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/gview.1
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/rgvim.1
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/rgview.1
+usr/share/man/it/man1/evim.1 usr/share/man/it/man1/eview.1
+
+usr/share/man/it.ISO8859-1/man1/gvim.1 usr/share/man/it.ISO8859-1/man1/gview.1
+usr/share/man/it.ISO8859-1/man1/gvim.1 usr/share/man/it.ISO8859-1/man1/rgvim.1
+usr/share/man/it.ISO8859-1/man1/gvim.1 usr/share/man/it.ISO8859-1/man1/rgview.1
+usr/share/man/it.ISO8859-1/man1/evim.1 usr/share/man/it.ISO8859-1/man1/eview.1
+
+usr/share/man/it.UTF-8/man1/gvim.1 usr/share/man/it.UTF-8/man1/gview.1
+usr/share/man/it.UTF-8/man1/gvim.1 usr/share/man/it.UTF-8/man1/rgvim.1
+usr/share/man/it.UTF-8/man1/gvim.1 usr/share/man/it.UTF-8/man1/rgview.1
+usr/share/man/it.UTF-8/man1/evim.1 usr/share/man/it.UTF-8/man1/eview.1
+
+usr/share/man/ru.KOI8-R/man1/gvim.1 usr/share/man/ru.KOI8-R/man1/gview.1
+usr/share/man/ru.KOI8-R/man1/gvim.1 usr/share/man/ru.KOI8-R/man1/rgvim.1
+usr/share/man/ru.KOI8-R/man1/gvim.1 usr/share/man/ru.KOI8-R/man1/rgview.1
+usr/share/man/ru.KOI8-R/man1/evim.1 usr/share/man/ru.KOI8-R/man1/eview.1
+
+usr/share/man/ru.UTF-8/man1/gvim.1 usr/share/man/ru.UTF-8/man1/gview.1
+usr/share/man/ru.UTF-8/man1/gvim.1 usr/share/man/ru.UTF-8/man1/rgvim.1
+usr/share/man/ru.UTF-8/man1/gvim.1 usr/share/man/ru.UTF-8/man1/rgview.1
+usr/share/man/ru.UTF-8/man1/evim.1 usr/share/man/ru.UTF-8/man1/eview.1
Modified: trunk/vim7/debian/vim-variant.postinst
===================================================================
--- trunk/vim7/debian/vim-variant.postinst 2006-03-25 22:52:47 UTC (rev 520)
+++ trunk/vim7/debian/vim-variant.postinst 2006-03-25 22:57:15 UTC (rev 521)
@@ -27,19 +27,32 @@
add_variant_alternative () {
update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
- 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/vimdiff vimdiff /usr/bin/vim.$variant $1
+ update-alternatives --install /usr/bin/rvim rvim /usr/bin/vim.$variant $1
+ update-alternatives --install /usr/bin/rview rview /usr/bin/vim.$variant $1
+ # Since other packages provide these commands, we'll setup alternatives for
+ # their manpages, too.
+ for i in vi view ex editor ; do
update-alternatives \
- --install /usr/bin/$i $i /usr/bin/vim $1 \
- --slave $mandir/man1/$i.1.gz $i.1.gz $mandir/man1/vim.1.gz \
- --slave $mandir/fr/man1/$i.1.gz $i.fr.1.gz $mandir/fr/man1/vim.1.gz \
- --slave $mandir/fr.ISO8859-1/man1/$i.1.gz $i.fr.ISO8859-1.1.gz $mandir/fr.ISO8859-1/man1/vim.1.gz \
- --slave $mandir/fr.UTF-8/man1/$i.1.gz $i.fr.UTF-8.1.gz $mandir/fr.UTF-8/man1/vim.1.gz \
- --slave $mandir/it/man1/$i.1.gz $i.it.1.gz $mandir/it/man1/vim.1.gz \
- --slave $mandir/it.ISO8859-1/man1/$i.1.gz $i.it.ISO8859-1.1.gz $mandir/it.ISO8859-1/man1/vim.1.gz \
- --slave $mandir/it.UTF-8/man1/$i.1.gz $i.it.UTF-8.1.gz $mandir/it.UTF-8/man1/vim.1.gz \
- --slave $mandir/ru.KOI8-R/man1/$i.1.gz $i.ru.KOI8-R.1.gz $mandir/ru.KOI8-R/man1/vim.1.gz \
- --slave $mandir/ru.UTF-8/man1/$i.1.gz $i.ru.UTF-8.1.gz $mandir/ru.UTF-8/man1/vim.1.gz
+ --install /usr/bin/$i $i /usr/bin/vim.$variant $1 \
+ --slave $mandir/man1/$i.1.gz $i.1.gz \
+ $mandir/man1/vim.1.gz \
+ --slave $mandir/fr/man1/$i.1.gz $i.fr.1.gz \
+ $mandir/fr/man1/vim.1.gz \
+ --slave $mandir/fr.ISO8859-1/man1/$i.1.gz $i.fr.ISO8859-1.1.gz \
+ $mandir/fr.ISO8859-1/man1/vim.1.gz \
+ --slave $mandir/fr.UTF-8/man1/$i.1.gz $i.fr.UTF-8.1.gz \
+ $mandir/fr.UTF-8/man1/vim.1.gz \
+ --slave $mandir/it/man1/$i.1.gz $i.it.1.gz \
+ $mandir/it/man1/vim.1.gz \
+ --slave $mandir/it.ISO8859-1/man1/$i.1.gz $i.it.ISO8859-1.1.gz \
+ $mandir/it.ISO8859-1/man1/vim.1.gz \
+ --slave $mandir/it.UTF-8/man1/$i.1.gz $i.it.UTF-8.1.gz \
+ $mandir/it.UTF-8/man1/vim.1.gz \
+ --slave $mandir/ru.KOI8-R/man1/$i.1.gz $i.ru.KOI8-R.1.gz \
+ $mandir/ru.KOI8-R/man1/vim.1.gz \
+ --slave $mandir/ru.UTF-8/man1/$i.1.gz $i.ru.UTF-8.1.gz \
+ $mandir/ru.UTF-8/man1/vim.1.gz
done
case "$variant" in
gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
@@ -49,38 +62,9 @@
}
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/man1/$i.1.gz $i.1.gz $mandir/man1/vim.1.gz \
- --slave $mandir/fr/man1/$i.1.gz $i.fr.1.gz $mandir/fr/man1/vim.1.gz \
- --slave $mandir/fr.ISO8859-1/man1/$i.1.gz $i.fr.ISO8859-1.1.gz $mandir/fr.ISO8859-1/man1/vim.1.gz \
- --slave $mandir/fr.UTF-8/man1/$i.1.gz $i.fr.UTF-8.1.gz $mandir/fr.UTF-8/man1/vim.1.gz \
- --slave $mandir/it/man1/$i.1.gz $i.it.1.gz $mandir/it/man1/vim.1.gz \
- --slave $mandir/it.ISO8859-1/man1/$i.1.gz $i.it.ISO8859-1.1.gz $mandir/it.ISO8859-1/man1/vim.1.gz \
- --slave $mandir/it.UTF-8/man1/$i.1.gz $i.it.UTF-8.1.gz $mandir/it.UTF-8/man1/vim.1.gz \
- --slave $mandir/ru.KOI8-R/man1/$i.1.gz $i.ru.KOI8-R.1.gz $mandir/ru.KOI8-R/man1/vim.1.gz \
- --slave $mandir/ru.UTF-8/man1/$i.1.gz $i.ru.UTF-8.1.gz $mandir/ru.UTF-8/man1/vim.1.gz
+ for i in gvim gview rgview rgvim evim eview gvimdiff ; do
+ update-alternatives --install /usr/bin/$i $i /usr/bin/vim.$variant $1
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
- for i in eview ; do
- update-alternatives --install /usr/bin/$i $i /usr/bin/gvim $1 \
- --slave $mandir/man1/$i.1.gz $i.1.gz $mandir/man1/evim.1.gz \
- --slave $mandir/fr/man1/$i.1.gz $i.fr.1.gz $mandir/fr/man1/evim.1.gz \
- --slave $mandir/fr.ISO8859-1/man1/$i.1.gz $i.fr.ISO8859-1.1.gz $mandir/fr.ISO8859-1/man1/evim.1.gz \
- --slave $mandir/fr.UTF-8/man1/$i.1.gz $i.fr.UTF-8.1.gz $mandir/fr.UTF-8/man1/evim.1.gz \
- --slave $mandir/it/man1/$i.1.gz $i.it.1.gz $mandir/it/man1/evim.1.gz \
- --slave $mandir/it.ISO8859-1/man1/$i.1.gz $i.it.ISO8859-1.1.gz $mandir/it.ISO8859-1/man1/evim.1.gz \
- --slave $mandir/it.UTF-8/man1/$i.1.gz $i.it.UTF-8.1.gz $mandir/it.UTF-8/man1/evim.1.gz \
- --slave $mandir/ru.KOI8-R/man1/$i.1.gz $i.ru.KOI8-R.1.gz $mandir/ru.KOI8-R/man1/evim.1.gz \
- --slave $mandir/ru.UTF-8/man1/$i.1.gz $i.ru.UTF-8.1.gz $mandir/ru.UTF-8/man1/evim.1.gz
- done
}
replace_dir_w_symlink () {
Modified: trunk/vim7/debian/vim-variant.prerm
===================================================================
--- trunk/vim7/debian/vim-variant.prerm 2006-03-25 22:52:47 UTC (rev 520)
+++ trunk/vim7/debian/vim-variant.prerm 2006-03-25 22:57:15 UTC (rev 521)
@@ -19,10 +19,9 @@
}
remove_variant_alternative () {
- for i in vi view ex editor rvim rview vimdiff ; do
- update-alternatives --remove $i /usr/bin/vim
+ for i in vi view ex editor rvim rview vimdiff vim; do
+ update-alternatives --remove $i /usr/bin/vim.$variant
done
- update-alternatives --remove vim /usr/bin/vim.$variant
case "$variant" in
gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
remove_gui_variant_alternative
@@ -31,10 +30,9 @@
}
remove_gui_variant_alternative () {
- for i in eview evim gview gvimdiff rgview rgvim ; do
- update-alternatives --remove $i /usr/bin/gvim
+ for i in eview evim gview gvimdiff rgview rgvim gvim; do
+ update-alternatives --remove $i /usr/bin/vim.$variant
done
- update-alternatives --remove gvim /usr/bin/vim.$variant
}
case "$1" in
More information about the pkg-vim-maintainers
mailing list