r611 - in trunk/vim7: debian patches

[James Vega]

Author: jamessan
Date: 2006-04-21 13:53:24 +0000 (Fri, 21 Apr 2006)
New Revision: 611

Removed:
   trunk/vim7/patches/102_pythoncomplete.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/series
Log:
7.0e04.  Down to one patch.


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-04-20 20:53:59 UTC (rev 610)
+++ trunk/vim7/debian/changelog	2006-04-21 13:53:24 UTC (rev 611)
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0e03-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0e04-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0e03).
+  * New upstream snapshot (7.0e04).
     + Remove 161_cmake-support.diff, merged upstream.
     + Recognize zsh-beta as a shell that supports '2>&1| tee' for the
       'shellpipe' option. (closes: #362999)
@@ -9,11 +9,12 @@
   [ Stefano Zacchiroli ]
   * Screening of patches no longer needed with vim7 & pushing upstream
     of as many debian-specific patches as possible. Results:
-    + removed patches: 104_debchangelog.vim.diff, 106_fstab.vim.diff,
-      108_automake.vim.diff, 109_xdefaults.vim.diff, 111_fstab.vim.diff,
-      119_php.vim.diff, 130_fstab.vim.diff, 133_resolv.vim.diff,
-      136_muttrc.vim.diff, 140_muttrc.vim.diff, 148_debchangelog.vim.diff,
-      157_slrnrc.vim.diff, 201_fr.po.diff, 203_zh_TW.UTF8.po.diff
+    + removed patches: 102_pythoncomplete.vim.diff, 104_debchangelog.vim.diff,
+      106_fstab.vim.diff, 108_automake.vim.diff, 109_xdefaults.vim.diff,
+      111_fstab.vim.diff, 119_php.vim.diff, 130_fstab.vim.diff,
+      133_resolv.vim.diff, 136_muttrc.vim.diff, 140_muttrc.vim.diff,
+      148_debchangelog.vim.diff, 157_slrnrc.vim.diff, 201_fr.po.diff,
+      203_zh_TW.UTF8.po.diff
     + The following runtime and translation files are now maintained upstream
       in a best effort fashion (i.e. they are looking for a new maintainer) by
       Debian VIM Maintainers: syntax/muttrc.vim, syntax/automake.vim,
@@ -22,7 +23,7 @@
     + syntax/debchangelog.vim is now officially maintained upstream by Debian
       VIM Maintainers
 
- -- James Vega <jamessan at debian.org>  Wed, 19 Apr 2006 21:22:10 -0400
+ -- James Vega <jamessan at debian.org>  Fri, 21 Apr 2006 09:51:20 -0400
 
 vim (1:6.4+7.0d03-1) experimental; urgency=low
 

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-04-20 20:53:59 UTC (rev 610)
+++ trunk/vim7/debian/rules	2006-04-21 13:53:24 UTC (rev 611)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0e
-SNAPSHOT=03
+SNAPSHOT=04
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/102_pythoncomplete.vim.diff
===================================================================
--- trunk/vim7/patches/102_pythoncomplete.vim.diff	2006-04-20 20:53:59 UTC (rev 610)
+++ trunk/vim7/patches/102_pythoncomplete.vim.diff	2006-04-21 13:53:24 UTC (rev 611)
@@ -1,13 +0,0 @@
-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:

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-04-20 20:53:59 UTC (rev 610)
+++ trunk/vim7/patches/series	2006-04-21 13:53:24 UTC (rev 611)
@@ -1,2 +1 @@
-102_pythoncomplete.vim.diff -p0
 109_xdefaults.vim.diff -p0