Package: vim
Version: 1:7.1-241+1
Severity: normal
Tags: patch

The debian/rules shipped with the vim package executes 'quilt' command
in such manner that user's ~/.quiltrc is included. Also, user may have
set QUILT_PATCHES variable to a non-default value. These may cause the
vim package to not build correctly in user's environment.

I suggest executing the 'quilt' command so that it defines the patches
directory explicitly and ignores the possible ~/.quiltrc file. A patch
is attached to fix this.
This patch changes quilt behaviour in debian/rules so that quilt doesn't use
user's default ~/.quiltrc file. It may contain settings which prevent quilt
from working correctly with vim package.
diff -ur vim-7.1.orig/debian/rules vim-7.1/debian/rules
--- vim-7.1.orig/debian/rules	2008-02-03 10:51:40.151208944 +0200
+++ vim-7.1/debian/rules	2008-02-03 10:53:27.710465492 +0200
@@ -141,6 +141,8 @@
 DOT_IN_DEPS += debian/vim-runtime.links
 DOT_IN_DEPS += debian/runtime/debian.vim
 
+QUILT = QUILT_PATCHES=patches quilt --quiltrc=/dev/null
+
 # nothing to do per default
 all:
 
@@ -153,7 +155,7 @@
 	  echo "applying upstream patch: $$f" ;\
 	  cat upstream/patches/$$f | patch -s -d$(SRCDIR) -p0 ;\
 	done
-	quilt push -a || test $$? = 2
+	$(QUILT) push -a || test $$? = 2
 	@echo "replacing upstream po files with our own"
 	cp $(wildcard runtime/lang/po/*) vim/src/po
 	touch $@
@@ -175,7 +177,7 @@
 	dh_testroot
 	rm -f extract-stamp* build-stamp* install-stamp* configure-stamp*
 	rm -f debian/helpztags.1
-	quilt pop -a || test $$? = 2
+	$(QUILT) pop -a || test $$? = 2
 	rm -rf .pc
 	rm -rf $(SRCDIR)
 	rm -rf debian/policy/vim-policy.html

Reply via email to