[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-116-g3a3a926

James Vega jamessan at debian.org
Sun May 25 15:12:24 UTC 2008


The following commit has been merged in the debian branch:
commit 960b571c29b63c2399efb72269aaffd18668d96d
Author: James Vega <jamessan at debian.org>
Date:   Fri May 23 09:30:23 2008 -0400

    Fix running tests in a shadowdir.
    
    Some tests require a .vim file, but these weren't being linked into
    $(SHADOWDIR)/testdir and therefore caused 'make test' to fail.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 1b9bc83..86467a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,8 +225,11 @@ configure-stamp-%:
 	dh_testdir
 	@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
 	$(MAKE) -C src shadow SHADOWDIR=$(SHADOWDIR)
+# Temporary workaround until upstream fixes the shadow portion of
+# their Makefile
 	if [ "$*" = "vim-basic" ]; then \
 	    cd src/vim-basic && ln -sf ../po; \
+	    cd testdir && ln -sf ../../testdir/*.vim .; \
 	fi
 	if test -f src/auto/config.cache; then make distclean; fi
 	cd src/$(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list