[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-203-gbdd0ad3

[James Vega]

The following commit has been merged in the debian branch:
commit bdd0ad33a57eb9f5fa775f8887ada6c9cfafb03f
Author: James Vega <jamessan at debian.org>
Date:   Thu Jun 26 13:48:15 2008 -0400

    Generate debian/lintian/vim-runtime so @VIMCUR@ is handled properly
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/lintian/vim-runtime b/debian/lintian/vim-runtime
deleted file mode 100644
index d6f85eb..0000000
--- a/debian/lintian/vim-runtime
+++ /dev/null
@@ -1,2 +0,0 @@
-vim-runtime binary: missing-dep-for-interpreter csh => tcsh | csh | c-shell (./usr/share/vim/vim71/tools/vim132)
-vim-runtime binary: csh-considered-harmful ./usr/share/vim/vim71/tools/vim132
diff --git a/debian/lintian/vim-runtime.in b/debian/lintian/vim-runtime.in
new file mode 100644
index 0000000..ea0b967
--- /dev/null
+++ b/debian/lintian/vim-runtime.in
@@ -0,0 +1,2 @@
+vim-runtime binary: missing-dep-for-interpreter csh => tcsh | csh | c-shell (./usr/share/vim/@VIMCUR@/tools/vim132)
+vim-runtime binary: csh-considered-harmful ./usr/share/vim/@VIMCUR@/tools/vim132
diff --git a/debian/rules b/debian/rules
index cdfd3d1..fef7dfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,6 +146,7 @@ DOT_IN_DEPS += debian/vim-runtime.links
 DOT_IN_DEPS += debian/vim-runtime.postrm
 DOT_IN_DEPS += debian/vim-runtime.preinst
 DOT_IN_DEPS += debian/runtime/debian.vim
+DOT_IN_DEPS += debian/lintian/vim-runtime
 DOT_IN_DEPS_TINY := debian/tiny/vimrc.tiny
 
 # nothing to do per default
@@ -405,10 +406,6 @@ install-stamp-vim-tiny: build-stamp-vim-tiny $(DOT_IN_DEPS_TINY)
 	done
 	sed -e "s:@PKG@:vim-tiny:;s:@VARIANT@:tiny:" \
 	    debian/lintian/vim-variant > debian/lintian/vim-tiny
-	# Handle the gvim menu file overrides
-	if [ -e "debian/lintian/vim-tiny.in" ]; then \
-	    cat debian/lintian/vim-tiny.in >> debian/lintian/vim-tiny; \
-	fi
 	for L in $(LANGS); do \
 	  sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
 	      -i debian/vim-tiny.postinst; \

-- 
Vim packaging