[SCM] Vim packaging branch, debian, updated. upstream/7.2.000-216-gf966c58

[James Vega]

The following commit has been merged in the debian branch:
commit f966c5801f70a60b389410c20afa38f213edeb6a
Merge: 869c5cf8d713f21b9112190e3ec0cce8208d6f04 242863e19a895e0b916031630d0b7f7323c3898b
Author: James Vega <jamessan at debian.org>
Date:   Sat Aug 9 21:51:59 2008 -0400

    Merge branch 'upstream-runtime' into debian

diff --combined src/Makefile
index 9d47cf5,e27a6ce..bbcaf24
--- a/src/Makefile
+++ b/src/Makefile
@@@ -901,7 -901,7 +901,7 @@@ MAN1DIR = /man
  
  ### Vim version (adjusted by a script)
  VIMMAJOR = 7
- VIMMINOR = 2c
+ VIMMINOR = 2
  
  ### Location of Vim files (should not need to be changed, and  {{{1
  ### some things might not work when they are changed!)
@@@ -1779,6 -1779,7 +1779,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)
@@@ -1913,6 -1914,7 +1913,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)
  

-- 
Vim packaging