r813 - in /trunk/packages/vim/debian: rules vim-common.links.in

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Tue Nov 28 22:12:44 2006
New Revision: 813

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=813
Log:
Commit the rest of the russian manpage changes I forgot to commit but were included in the last upload.

Modified:
    trunk/packages/vim/debian/rules
    trunk/packages/vim/debian/vim-common.links.in

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=813&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Nov 28 22:12:44 2006
@@ -177,7 +177,7 @@
 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.KOI8-R ru.UTF-8
+LANGS += ru
 
 DOT_IN_DEPS = debian/vim-runtime.install
 DOT_IN_DEPS += debian/vim-runtime.install
@@ -344,6 +344,13 @@
 	
 	# 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
+	
 	 # disabled, waiting for an update
 	 #cp debian/vim-install $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name

Modified: trunk/packages/vim/debian/vim-common.links.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.links.in?rev=813&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.links.in (original)
+++ trunk/packages/vim/debian/vim-common.links.in Tue Nov 28 22:12:44 2006
@@ -30,8 +30,5 @@
 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.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
+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