[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-108-g3cddda5
James Vega
jamessan at debian.org
Thu May 8 03:01:20 UTC 2008
The following commit has been merged in the debian branch:
commit eb13803a13b75dba8f888774de08f160aa00d41b
Merge: e387bac4eabd7aef3427fa777003a9ffb98157df ceb76d69a9deff5abe2fb4d996a30a889eb3719f
Author: James Vega <jamessan at debian.org>
Date: Wed May 7 22:33:36 2008 -0400
Merge branch 'upstream' into debian
diff --combined src/Makefile
index b1947cb,3040dca..8522751
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1758,6 -1758,7 +1758,6 @@@ installvimbin: $(VIMTARGET) $(DESTDIR)$
rm -f $(DEST_BIN)/$(VIMNAME).rm; \
fi
$(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/$(VIMTARGET)
chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
# may create a link to the new executable from /usr/bin/vi
-$(LINKIT)
@@@ -1866,6 -1867,8 +1866,8 @@@ installmacros: $(DEST_VIM) $(DEST_RT) $
installtutorbin: $(DEST_VIM)
$(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
+ $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
+ chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor
installtutor: $(DEST_RT) $(DEST_TUTOR)
-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
@@@ -1888,6 -1891,7 +1890,6 @@@ installtools: $(TOOLS) $(DESTDIR)$(exec
rm -f $(DEST_BIN)/xxd.rm; \
fi
$(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
@@@ -2073,6 -2077,7 +2075,7 @@@ installmanlinks
uninstall: uninstall_runtime
-rm -f $(DEST_BIN)/$(VIMTARGET)
-rm -f $(DEST_BIN)/vimtutor
+ -rm -f $(DEST_BIN)/gvimtutor
-rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET)
-rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET)
-rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET)
@@@ -2169,7 -2174,7 +2172,7 @@@ SHADOWDIR = shado
shadow: runtime pixmaps
mkdir $(SHADOWDIR)
- cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs .
+ cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
cd $(SHADOWDIR); rm -f auto/link.sed
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list