[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-231-g0cc0350
James Vega
jamessan at debian.org
Tue Jul 8 16:04:50 UTC 2008
The following commit has been merged in the debian branch:
commit 0cc0350d1f4a88df6aa37797d4ce3c704cf89ad2
Author: James Vega <jamessan at debian.org>
Date: Sun Jul 6 17:01:18 2008 -0400
Only install UTF-8 encoded manpages.
Now that man handles the recoding, install the UTF-8 manpages provided by Vim
into /usr/share/man/$ll/man1.
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/debian/rules b/debian/rules
index d24a442..d18b440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,16 +137,17 @@ LANG_TARBALL:=$(NAME)-$(VERSION)$(SNAPSHOT)-lang.tar.gz
EXTRA_TARBALL:=$(NAME)-$(VERSION)$(SNAPSHOT)-extra.tar.gz
ORIG_SOURCE := ../$(NAME)_$(DEBVERSION).orig.tar.gz
PER_VARIANT_FILES := install postinst prerm links
-LANGS += fr fr.ISO8859-1 fr.UTF-8
-LANGS += it it.ISO8859-1 it.UTF-8
-LANGS += pl pl.ISO8859-2 pl.UTF-8
-LANGS += ru
+LANGS := fr it pl ru
+LANGS_RM := fr.ISO8859-1 fr
+LANGS_RM += it.ISO8859-1 it
+LANGS_RM += pl.ISO8859-2 pl
+LANGS_RM += ru.KOI8-R
-DOT_IN_DEPS := debian/vim-runtime.install
-DOT_IN_DEPS += debian/vim-common.install
-DOT_IN_DEPS += debian/vim-gui-common.install
+DOT_IN_DEPS := debian/vim-common.install
DOT_IN_DEPS += debian/vim-common.links
+DOT_IN_DEPS += debian/vim-gui-common.install
DOT_IN_DEPS += debian/vim-gui-common.links
+DOT_IN_DEPS += debian/vim-runtime.install
DOT_IN_DEPS += debian/vim-runtime.links
DOT_IN_DEPS += debian/vim-runtime.postrm
DOT_IN_DEPS += debian/vim-runtime.preinst
@@ -199,19 +200,19 @@ clean: $(foreach v,$(VARIANTS),clean-$(v))
dh_clean
clean-vim-basic:
+ dh_testdir
+ dh_testroot
for x in $(PER_VARIANT_FILES) ; do \
rm -f debian/vim.$$x ; \
done
- for x in vim-gui-common.{install,links} vim-common.{install,links} \
- vim-runtime.install; do \
- rm -f debian/$$x; \
- done
[ ! -L src/vim-basic/po ] || $(MAKE) -C src/vim-basic/po clean
rm -f $(DOT_IN_DEPS)
rm -rf src/vim-basic
clean-%: SHADOWDIR=$*
clean-%:
+ dh_testdir
+ dh_testroot
for x in $(PER_VARIANT_FILES) ; do \
rm -f debian/$*.$$x ; \
done
@@ -299,18 +300,26 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
# DEBIAN INSTALLATION
- # According to #368754 and #323820, Russian manpages should be in
- # /usr/share/man/ru (KOI8-R encoded) and man will handle the
- # transcoding
- mv $(DESTDIR)/usr/share/man/ru{.KOI8-R,}
- # Remove this so the dh_install later doesn't fail
- rm -rf $(DESTDIR)/usr/share/man/ru.UTF-8
+ # Remove non-UTF8 manpage directories
+ for d in $(LANGS_RM); do \
+ rm -rf $(DESTDIR)/usr/share/man/$$d; \
+ done
+ # Setup the UTF8 manpage directories as the base language directories
+ for d in $(LANGS); do \
+ mv $(DESTDIR)/usr/share/man/$$d.UTF-8 $(DESTDIR)/usr/share/man/$$d; \
+ done
# 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 \
+ for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
rm -f $$f; \
done
+
+ # rm stuff handled by our own symlinks
+ for f in `find $(DESTDIR)/usr/share/man -name rvim.1 -o -name rview.1`; do \
+ rm -f $$f; \
+ done
+
# helpztags manpage
pod2man -c "User Commands" -s 1 -q none -r "vim $(VERSION)$(SNAPSHOT)" \
-d "September 2003" debian/helpztags debian/helpztags.1
@@ -332,17 +341,19 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
# Generate language-specific sections of
# vim-{runtime,common,gui-common}.install files
- @for L in $(LANGS); do \
+ for L in $(LANGS); do \
echo debian/tmp/usr/share/man/$$L/man1/vimtutor.1 \
usr/share/man/$$L/man1/ >>debian/vim-runtime.install; \
done
- @for L in $(LANGS); do \
- echo debian/tmp/usr/share/man/$$L/man1/\* \
- usr/share/man/$$L/man1/ >>debian/vim-common.install; \
+ for L in $(LANGS); do \
+ for f in vim xxd vimdiff; do \
+ echo debian/tmp/usr/share/man/$$L/man1/$$f.1 \
+ usr/share/man/$$L/man1/ >>debian/vim-common.install; \
+ done; \
done
- @for L in $(LANGS); do \
+ for L in $(LANGS); do \
echo debian/tmp/usr/share/man/$$L/man1/evim.1 \
usr/share/man/$$L/man1/ >>debian/vim-gui-common.install; \
done
@@ -354,30 +365,23 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
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 \
+ 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
- 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
# Generate language-specific sections of
# vim-{common,gui-common}.links files
- @for L in $(LANGS); do \
+ for L in $(LANGS); do \
for p in rvim rview; do \
echo usr/share/man/$$L/man1/vim.1 \
usr/share/man/$$L/man1/$$p.1 >>debian/vim-common.links; \
done; \
done
- @for L in $(LANGS); do \
+ for L in $(LANGS); do \
for p in gview rgvim rgview; do \
echo usr/share/man/$$L/man1/gvim.1 \
usr/share/man/$$L/man1/$$p.1 >>debian/vim-gui-common.links; \
diff --git a/debian/vim-common.install.in b/debian/vim-common.install.in
index ac7c0a6..ed22942 100644
--- a/debian/vim-common.install.in
+++ b/debian/vim-common.install.in
@@ -2,4 +2,6 @@ debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/runtime/vimrc etc/vim/
debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
-debian/tmp/usr/share/man/man1/* usr/share/man/man1/
+debian/tmp/usr/share/man/man1/xxd.1 usr/share/man/man1/
+debian/tmp/usr/share/man/man1/vimdiff.1 usr/share/man/man1/
+debian/tmp/usr/share/man/man1/vim.1 usr/share/man/man1/
diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in
index df55cd9..0050695 100644
--- a/debian/vim-common.links.in
+++ b/debian/vim-common.links.in
@@ -1,33 +1,5 @@
etc/vim usr/share/vim/vimfiles
etc/vim/vimrc usr/share/vim/vimrc
usr/share/vim/@VIMCUR@ usr/share/vim/vimcurrent
-
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/pl.ISO8859-2/man1/vim.1 usr/share/man/pl.ISO8859-2/man1/rvim.1
-usr/share/man/pl.ISO8859-2/man1/vim.1 usr/share/man/pl.ISO8859-2/man1/rview.1
-
-usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rvim.1
-usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rview.1
-
-usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rvim.1
-usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rview.1
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list