r954 - in /trunk/packages/vim: debian/changelog patches/Makefile_no-strip.diff patches/series patches/syntax.c_syn-include.diff

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Sun Jun 17 17:19:36 2007
New Revision: 954

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=954
Log:
Add syntax.c_syn-include.diff, which fixes a bug in sourcing runtime files when a relative path is given to :syn-include.  (Closes: #395517)
Add Makefile_no-strip.diff, which removes the calls to strip in upstream's makefile.  We'll handle that in debian/rules.

Added:
    trunk/packages/vim/patches/Makefile_no-strip.diff
    trunk/packages/vim/patches/syntax.c_syn-include.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=954&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Jun 17 17:19:36 2007
@@ -9,6 +9,10 @@
   * Remove 'viminfo' and 'textwidth' settings from $VIMRUNTIME/debian.vim.  We
     were uselessly setting 'textwidth' to the default value and 'viminfo' to
     an almost-default but less useful value.
+  * Add syntax.c_syn-include.diff, which fixes a bug in sourcing runtime files
+    when a relative path is given to :syn-include.  (Closes: #395517)
+  * Add Makefile_no-strip.diff, which removes the calls to strip in upstream's
+    makefile.  We'll handle that in debian/rules.
 
   [ Stefano Zacchiroli ]
   * Add javac_cmdline-vim.diff, which fixes the invocation of the javac
@@ -20,7 +24,7 @@
     - added build deps on docbook stuff to build the policy (note that this
       includes lynx, due to #387035)
 
- -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Jun 2007 10:04:21 +0100
+ -- James Vega <jamessan at debian.org>  Sun, 17 Jun 2007 17:59:42 +0100
 
 vim (1:7.1-000+1) unstable; urgency=low
 

Added: trunk/packages/vim/patches/Makefile_no-strip.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/Makefile_no-strip.diff?rev=954&op=file
==============================================================================
--- trunk/packages/vim/patches/Makefile_no-strip.diff (added)
+++ trunk/packages/vim/patches/Makefile_no-strip.diff Sun Jun 17 17:19:36 2007
@@ -1,0 +1,20 @@
+Index: vim-7.1/vim/src/Makefile
+===================================================================
+--- vim-7.1.orig/vim/src/Makefile	2007-06-17 17:59:03.000000000 +0100
++++ vim-7.1/vim/src/Makefile	2007-06-17 17:59:21.000000000 +0100
+@@ -1758,7 +1758,6 @@
+ 	  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)
+@@ -1889,7 +1888,6 @@
+ 	  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)
+ 

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=954&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sun Jun 17 17:19:36 2007
@@ -14,3 +14,5 @@
 zh_TW.po-swap_recovery_typo.diff -p0
 changelog.vim-date_end_entry.diff -p0
 javac_cmdline-vim.diff -p0
+syntax.c_syn-include.diff
+Makefile_no-strip.diff

Added: trunk/packages/vim/patches/syntax.c_syn-include.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/syntax.c_syn-include.diff?rev=954&op=file
==============================================================================
--- trunk/packages/vim/patches/syntax.c_syn-include.diff (added)
+++ trunk/packages/vim/patches/syntax.c_syn-include.diff Sun Jun 17 17:19:36 2007
@@ -1,0 +1,13 @@
+Index: vim-7.1/vim/src/syntax.c
+===================================================================
+--- vim-7.1.orig/vim/src/syntax.c	2007-06-17 17:30:11.000000000 +0100
++++ vim-7.1/vim/src/syntax.c	2007-06-17 17:30:27.000000000 +0100
+@@ -4461,7 +4461,7 @@
+     prev_toplvl_grp = curbuf->b_syn_topgrp;
+     curbuf->b_syn_topgrp = sgl_id;
+     if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL
+-				: source_runtime(eap->arg, DOSO_NONE) == FAIL)
++				: source_runtime(eap->arg, TRUE) == FAIL)
+ 	EMSG2(_(e_notopen), eap->arg);
+     curbuf->b_syn_topgrp = prev_toplvl_grp;
+     current_syn_inc_tag = prev_syn_inc_tag;