[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-86-g92052e8

[James Vega]

The following commit has been merged in the debian branch:
commit 92052e8307e145a4d75c4c8ad6cdcf5e59151de1
Author: James Vega <jamessan at debian.org>
Date:   Tue Apr 22 15:38:39 2008 -0400

    Fix expansion of @VIMCUR@ in vimrc.tiny.
    
    Rename vimrc.tiny to vimrc.tiny.in and set DOT_IN_DEPS_TINY to
    debian/tiny/vimrc.tiny.in.  Add conditional cleanup of DOT_IN_DEPS_TINY in the
    clean-% target and conditional prerequisite of DOT_IN_DEPS_TINY in the
    install-stamp-% target.
    
    Based off a patch by Daniel Hahler.  Closes #477379
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 300122f..be85d1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,6 +135,7 @@ DOT_IN_DEPS += debian/vim-common.links
 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: 
@@ -196,6 +197,9 @@ clean-%:
 	done
 	rm -f debian/lintian/$*
 	rm -f src/$(subst -,.,$*)
+	if [ "$*" = "vim-tiny" ]; then \
+	  rm -f $(DOT_IN_DEPS_TINY); \
+	fi
 
 build: build-stamp
 build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
@@ -361,7 +365,7 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 # the other variants only include the binary
 install-stamp-%: export DH_OPTIONS=-p$*
 install-stamp-%: DESTDIR=$(CURDIR)/debian/$*
-install-stamp-%: build-stamp-%
+install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),)
 	dh_testdir
 	dh_testroot
 	@echo "*** DEBIAN *** INSTALLING VARIANT $*"
diff --git a/debian/tiny/vimrc.tiny b/debian/tiny/vimrc.tiny.in
similarity index 100%
rename from debian/tiny/vimrc.tiny
rename to debian/tiny/vimrc.tiny.in

-- 
Vim packaging