r586 - in trunk/vim7: debian patches

[James Vega]

Author: jamessan
Date: 2006-04-13 13:08:58 +0000 (Thu, 13 Apr 2006)
New Revision: 586

Added:
   trunk/vim7/patches/102_pythoncomplete.vim.diff
Removed:
   trunk/vim7/patches/102_pycomplete.vim.diff
   trunk/vim7/patches/103_sh.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/series
Log:
Update for 7.0d02.
103_sh.vim.diff was applied upstream.
102_pycomplete.vim.diff was renamed to match the pycomplete.vim ->
pythoncomplete.vim renaming.


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/debian/changelog	2006-04-13 13:08:58 UTC (rev 586)
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0d01-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0d02-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0d01).
+  * New upstream snapshot (7.0d02).
     + A lot of new features have been added, most notably: spell checking,
       omni completion, tabs, undo branches, internal grep, location lists,
       list/dictionary/funcref types for scripting.
@@ -21,12 +21,12 @@
   [ Stefano Zacchiroli ]
   * Screening of patches no longer needed with vim7 & pushing upstream
     of as many debian-specific patches as possible. Results:
-    + removed patches: 101_make.vim.diff, 117_fortram.vim.diff,
-      122_html_indent.vim.diff, 135_debsources.vim.diff, 145_fortran.vim.diff,
-      155_rst.vim.diff
+    + removed patches: 101_make.vim.diff, 103_sh.vim.diff,
+      117_fortram.vim.diff, 122_html_indent.vim.diff, 135_debsources.vim.diff,
+      145_fortran.vim.diff, 155_rst.vim.diff
     + removed updates: debian/updates/debsources.vim
 
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 11 Apr 2006 19:23:16 -0400
+ -- James Vega <jamessan at debian.org>  Thu, 13 Apr 2006 09:06:39 -0400
 
 vim (1:6.4+7.0c05-1) experimental; urgency=low
 

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/debian/rules	2006-04-13 13:08:58 UTC (rev 586)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0d
-SNAPSHOT=01
+SNAPSHOT=02
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/102_pycomplete.vim.diff
===================================================================
--- trunk/vim7/patches/102_pycomplete.vim.diff	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/patches/102_pycomplete.vim.diff	2006-04-13 13:08:58 UTC (rev 586)
@@ -1,13 +0,0 @@
-Index: vim/runtime/autoload/pycomplete.vim
-===================================================================
---- vim/runtime/autoload/pycomplete.vim.orig
-+++ vim/runtime/autoload/pycomplete.vim
-@@ -85,7 +85,7 @@
- def get_completions(base):
-     stmt = vim.eval('expand("<cWORD>")')
-     #dbg(1,"statement: %s - %s" % (stmt, base))
--    stmt = stmt+base
-+    stmt = str(stmt)+base
-     eval_source_code()
- 
-     try:

Copied: trunk/vim7/patches/102_pythoncomplete.vim.diff (from rev 585, trunk/vim7/patches/102_pycomplete.vim.diff)
===================================================================
--- trunk/vim7/patches/102_pycomplete.vim.diff	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/patches/102_pythoncomplete.vim.diff	2006-04-13 13:08:58 UTC (rev 586)
@@ -0,0 +1,13 @@
+Index: vim/runtime/autoload/pythoncomplete.vim
+===================================================================
+--- vim/runtime/autoload/pythoncomplete.vim.orig
++++ vim/runtime/autoload/pythoncomplete.vim
+@@ -85,7 +85,7 @@
+ def get_completions(base):
+     stmt = vim.eval('expand("<cWORD>")')
+     #dbg(1,"statement: %s - %s" % (stmt, base))
+-    stmt = stmt+base
++    stmt = str(stmt)+base
+     eval_source_code()
+ 
+     try:

Deleted: trunk/vim7/patches/103_sh.vim.diff
===================================================================
--- trunk/vim7/patches/103_sh.vim.diff	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/patches/103_sh.vim.diff	2006-04-13 13:08:58 UTC (rev 586)
@@ -1,13 +0,0 @@
-Index: vim/runtime/syntax/sh.vim
-===================================================================
---- vim/runtime/syntax/sh.vim.orig
-+++ vim/runtime/syntax/sh.vim
-@@ -254,7 +254,7 @@
- " Comments: {{{1
- "==========
- syn cluster    shCommentGroup	contains=shTodo, at Spell
--syn keyword    shTodo	contained	TODO
-+syn keyword    shTodo	contained	TODO FIXME XXX
- syn match      shComment	"#.*$" contains=@shCommentGroup
- 
- " File Redirection Highlighted As Operators: {{{1

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-04-12 16:35:15 UTC (rev 585)
+++ trunk/vim7/patches/series	2006-04-13 13:08:58 UTC (rev 586)
@@ -1,5 +1,4 @@
-102_pycomplete.vim.diff -p0
-103_sh.vim.diff -p0
+102_pythoncomplete.vim.diff -p0
 104_debchangelog.vim.diff -p0
 106_fstab.vim.diff -p0
 108_automake.vim.diff -p0