Bug#477379: vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath)

[Daniel Hahler]

Package: vim
Version: 1:7.1.293-1
Severity: normal
Tags: patch

In /etc/vim/vimrc.tiny there is an unsubstituted reference to @VIMCUR@,
because debian/tiny/vimrc.tiny gets not handled like the other
.in-files:
set runtimepath=~/.vim,[...],/usr/share/vim/@VIMCUR@,[...],~/.vim/after

>From a quick look at debian/rules in the source package, it seems like
./debian/tiny/vimrc.tiny should get shipped as
./debian/tiny/vimrc.tiny.in and handled similar to the other files defined in
DOT_IN_DEPS, so that it gets processed by the following block:
  %: %.in
        cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@

I'm attaching a patch, which fixes this in Ubuntu, but it does not apply
to the more recent version in unstable.
However, I don't think it's the best approach anyway, because I've
hooked it into the build-stamp-vim-tiny target, while DOT_IN_DEPS gets
handled by the install target for vim-basic.
-------------- next part --------------
reverted:
--- vim-7.1/debian/tiny/vimrc.tiny
+++ vim-7.1.orig/debian/tiny/vimrc.tiny
@@ -1,13 +0,0 @@
-" Vim configuration file, in effect when invoked as "vi". The aim of this
-" configuration file is to provide a Vim environment as compatible with the
-" original vi as possible. Note that ~/.vimrc configuration files as other
-" configuration files in the runtimepath are still sourced.
-" When Vim is invoked differently ("vim", "view", "evim", ...) this file is
-" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
-
-" Debian system-wide default configuration Vim
-set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
-
-set compatible
-
-" vim: set ft=vim:
diff -u vim-7.1/debian/changelog vim-7.1/debian/changelog
--- vim-7.1/debian/changelog
+++ vim-7.1/debian/changelog
@@ -1,3 +1,10 @@
+vim (1:7.1-138+1ubuntu4) hardy; urgency=low
+
+  * Move debian/tiny/vimrc.tiny to vimrc.tiny.in, so that @VIMCUR@ gets
+    substituted (LP: #220561)
+
+ -- Daniel Hahler <ubuntu at thequod.de>  Tue, 22 Apr 2008 12:40:05 +0200
+
 vim (1:7.1-138+1ubuntu3) hardy; urgency=low
 
   * patches/debchangelog_launchpad.diff:
diff -u vim-7.1/debian/rules vim-7.1/debian/rules
--- vim-7.1/debian/rules
+++ vim-7.1/debian/rules
@@ -140,6 +140,7 @@
 DOT_IN_DEPS += debian/vim-gui-common.links
 DOT_IN_DEPS += debian/vim-runtime.links
 DOT_IN_DEPS += debian/runtime/debian.vim
+DOT_IN_DEPS_TINY = debian/tiny/vimrc.tiny
 
 # nothing to do per default
 all:
@@ -200,6 +201,7 @@
 	  patch -Rp0 < debian/tiny/vimrc.tiny.diff; \
 	  rm -f patch-stamp-vimrc-tiny; \
 	fi
+	rm -f $(DOT_IN_DEPS_TINY)
 
 clean-%:
 	for x in $(PER_VARIANT_FILES) ; do \
@@ -241,6 +243,7 @@
 	touch $@
 
 build-stamp-vim-tiny: CURCFLAGS=$(CFLAGS_vim-tiny)
+build-stamp-vim-tiny: $(DOT_IN_DEPS_TINY)
 build-stamp-vim-tiny: configure-stamp-vim-tiny
 	dh_testdir
 	@echo "*** DEBIAN *** BUILDING VARIANT vim-tiny"
only in patch2:
unchanged:
--- vim-7.1.orig/debian/tiny/vimrc.tiny.in
+++ vim-7.1/debian/tiny/vimrc.tiny.in
@@ -0,0 +1,13 @@
+" Vim configuration file, in effect when invoked as "vi". The aim of this
+" configuration file is to provide a Vim environment as compatible with the
+" original vi as possible. Note that ~/.vimrc configuration files as other
+" configuration files in the runtimepath are still sourced.
+" When Vim is invoked differently ("vim", "view", "evim", ...) this file is
+" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
+
+" Debian system-wide default configuration Vim
+set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
+
+set compatible
+
+" vim: set ft=vim: