[SCM] Vim packaging branch, master, updated. upstream/7.1.ds-373-gd0783d6
James Vega
jamessan at debian.org
Sun Mar 30 21:09:20 UTC 2008
The following commit has been merged in the master branch:
commit edaffc56c953f3ea9714326f76c4b8a92e4eb90f
Author: James Vega <jamessan at debian.org>
Date: Sun Mar 30 14:16:33 2008 -0400
Remove debian/tmp/usr/bin/vim since we install the vim binary from src for the sake of a simpler rules files.
If we don't remove debian/tmp/usr/bin/vim then dh_install fails (as we
want it to).
diff --git a/debian/rules b/debian/rules
index fd67b16..9dd774e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,7 +234,10 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
if [ $(MAKETEST) = "yes" ]; then \
$(MAKE) -C src DESTDIR=$(DESTDIR) test; \
fi
- rm -f src/vim
+ # installvimbin installs the vim binary under debian/tmp but we install
+ # it into the vim package from src/. Need to rm it from debian/tmp so
+ # that dh_install doesn't fail
+ rm -f src/vim debian/tmp/usr/bin/vim
# DEBIAN INSTALLATION
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list