[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-88-gf454e67

[James Vega]

The following commit has been merged in the debian branch:
commit f454e67251be2efda8e7e0db0e881c7173bde80d
Author: James Vega <jamessan at debian.org>
Date:   Wed Apr 23 13:43:31 2008 -0400

    Separate out the install-stamp-vim-tiny target.
    
    Apparently my make fu isn't strong enough.  Trying to make a prerequisite that
    is only enabled when the wildcard target matches a certain value didn't work
    right.  Simplify things by giving vim-tiny its own install-stamp target.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 69039e1..f547747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -363,9 +363,47 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	touch $@
 
 # the other variants only include the binary
+install-stamp-vim-tiny: export DH_OPTIONS=-pvim-tiny
+install-stamp-vim-tiny: DESTDIR=$(CURDIR)/debian/vim-tiny
+install-stamp-vim-tiny: build-stamp-vim-tiny $(DOT_IN_DEPS_TINY)
+	dh_testdir
+	dh_testroot
+	@echo "*** DEBIAN *** INSTALLING VARIANT vim-tiny"
+	dh_clean -k
+	dh_installdirs
+	
+	# variant-related installations
+	# to be kept in sync with those in "install-stamp-vim-basic" target
+	for x in $(PER_VARIANT_FILES) ; do \
+	  sed -e "s:@PKG@:vim-tiny:" -e "s:@VARIANT@:tiny:" \
+	      -e "s:@COMMON@:vim-common:" \
+	      debian/vim-variant.$$x > debian/vim-tiny.$$x ;\
+	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; \
+	done
+	sed -i "/@LANG_ALTS@/d" debian/vim-tiny.postinst
+	# fake help installation for vim-tiny
+	echo "debian/tiny/doc/	usr/share/vim/$(VIMCUR)" >> debian/vim-tiny.install; \
+	echo "debian/tiny/vimrc.tiny	etc/vim" >> debian/vim-tiny.install; \
+	echo "etc/vim/vimrc.tiny	usr/share/vim/vimrc.tiny" >> debian/vim-tiny.links; \
+	dh_install
+	dh_installmenu
+	dh_link
+	
+	touch $@
+
+# the other variants only include the binary
 install-stamp-%: export DH_OPTIONS=-p$*
 install-stamp-%: DESTDIR=$(CURDIR)/debian/$*
-install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),)
+install-stamp-%: build-stamp-%
 	dh_testdir
 	dh_testroot
 	@echo "*** DEBIAN *** INSTALLING VARIANT $*"
@@ -375,7 +413,7 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),)
 	# variant-related installations
 	# to be kept in sync with those in "install-stamp-vim-basic" target
 	for x in $(PER_VARIANT_FILES) ; do \
-	  if [ "$*" = "vim-tiny" -o "$*" = "vim-nox" ]; then \
+	  if [ "$*" = "vim-nox" ]; then \
 	    sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
 	        -e "s:@COMMON@:vim-common:" \
 	        debian/vim-variant.$$x > debian/$*.$$x ;\
@@ -396,12 +434,6 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),)
 	      -i debian/$*.postinst; \
 	done
 	sed -i "/@LANG_ALTS@/d" debian/$*.postinst
-	# fake help installation for vim-tiny
-	if [ "$*" = "vim-tiny" ]; then \
-		echo "debian/tiny/doc/	usr/share/vim/$(VIMCUR)" >> debian/$*.install; \
-		echo "debian/tiny/vimrc.tiny	etc/vim" >> debian/$*.install; \
-		echo "etc/vim/vimrc.tiny	usr/share/vim/vimrc.tiny" >> debian/$*.links; \
-	fi
 	dh_install
 	dh_installmenu
 	dh_link

-- 
Vim packaging