r560 - in trunk/vim7: debian patches

[Stefano Zacchiroli]

Author: zack
Date: 2006-03-30 15:41:32 +0000 (Thu, 30 Mar 2006)
New Revision: 560

Removed:
   trunk/vim7/patches/123_accents.diff
   trunk/vim7/patches/158_python.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/pushed-upstream.txt
   trunk/vim7/patches/series
Log:
ported to vim 7.0c3


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/debian/changelog	2006-03-30 15:41:32 UTC (rev 560)
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0c02-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0c03-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0c02).
+  * New upstream snapshot (7.0c03).
     + Added support for bzr diffs in scripts.vim, thanks to Adeodato Simó.
       (closes: #355922)
 
@@ -32,9 +32,10 @@
   * Screening of patches no longer needed with vim7 & pushing upstream
     of as many debian-specific patches as possible. Results:
     + removed patches: 102_filetype.vim.diff, 107_vim.1.diff, 107_xxd.1.diff,
-      105_recognize-gnumakefile-am.diff, 133_filetype.vim.diff,
-      142_filetype.vim.diff, 153_filetype.vim.diff, 154_svn.vim.diff,
-      156_scripts.vim.diff, 301_xxd.c.diff, 303_option.c.diff, 305_term.c.diff
+      105_recognize-gnumakefile-am.diff, 123_accents.diff,
+      133_filetype.vim.diff, 142_filetype.vim.diff, 153_filetype.vim.diff,
+      154_svn.vim.diff, 156_scripts.vim.diff, 158_python.vim.diff,
+      301_xxd.c.diff, 303_option.c.diff, 305_term.c.diff
   * Added script debian/spell/mkvimspell.sh, it generates Vim spell files from
     (Debian's) MySpell dictionaries.
 

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/debian/rules	2006-03-30 15:41:32 UTC (rev 560)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0c
-SNAPSHOT=02
+SNAPSHOT=03
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/123_accents.diff
===================================================================
--- trunk/vim7/patches/123_accents.diff	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/patches/123_accents.diff	2006-03-30 15:41:32 UTC (rev 560)
@@ -1,51 +0,0 @@
-Index: vim/runtime/keymap/accents.vim
-===================================================================
---- vim/runtime/keymap/accents.vim.orig
-+++ vim/runtime/keymap/accents.vim
-@@ -15,6 +15,7 @@
- ´A	Á
- ^A	Â
- ~A	Ã
-+:A	Ä
- 'C	Ç
- ´C	Ç
- `E	È
-@@ -31,10 +32,12 @@
- ´O	Ó
- ^O	Ô
- ~O	Õ
-+:O	Ö
- `U	Ù
- 'U	Ú
- ´U	Ú
- ^U	Û
-+:U	Ü
- 'Y	Ý
- ´Y	Ý
- `a	à
-@@ -42,6 +45,7 @@
- ´a	á
- ^a	â
- ~a	ã
-+:a	ä
- 'c	ç
- ´c	ç
- `e	è
-@@ -58,10 +62,12 @@
- ´o	ó
- ^o	ô
- ~o	õ
-+:o	ö
- `u	ù
- 'u	ú
- ´u	ú
- ^u	û
-+:u	ü
- 'y	ý
- ´y	ý
- ''	'
-@@ -69,3 +75,4 @@
- ``	`
- ^^	^
- ~~	~
-+::	:

Deleted: trunk/vim7/patches/158_python.vim.diff
===================================================================
--- trunk/vim7/patches/158_python.vim.diff	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/patches/158_python.vim.diff	2006-03-30 15:41:32 UTC (rev 560)
@@ -1,13 +0,0 @@
-Index: vim/runtime/syntax/python.vim
-===================================================================
---- vim/runtime/syntax/python.vim.orig
-+++ vim/runtime/syntax/python.vim
-@@ -47,7 +47,7 @@
- syn keyword pythonRepeat	for while
- syn keyword pythonConditional	if elif else
- syn keyword pythonOperator	and in is not or
--syn keyword pythonPreCondit	import from
-+syn keyword pythonPreCondit	import from as
- syn match   pythonComment	"#.*$" contains=pythonTodo
- syn keyword pythonTodo		TODO FIXME XXX contained
- 

Modified: trunk/vim7/patches/pushed-upstream.txt
===================================================================
--- trunk/vim7/patches/pushed-upstream.txt	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/patches/pushed-upstream.txt	2006-03-30 15:41:32 UTC (rev 560)
@@ -28,11 +28,6 @@
   Signaled to maintainer and Bram
   Mon, 27 Mar 2006 09:10:15 -0500 zack
 
-123_accents.diff
-
-  Signaled to Bram
-  Tue, 28 Mar 2006 22:11:45 -0500 zack
-
 133_resolv.vim.diff
 
   Signaled to maintainer and Bram

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-03-29 20:27:03 UTC (rev 559)
+++ trunk/vim7/patches/series	2006-03-30 15:41:32 UTC (rev 560)
@@ -8,7 +8,6 @@
 117_fortran.vim.diff -p0
 119_php.vim.diff -p0
 122_html_indent.vim.diff -p0
-123_accents.diff -p0
 130_fstab.vim.diff -p0
 133_resolv.vim.diff -p0
 135_debsources.vim.diff -p0
@@ -18,7 +17,6 @@
 148_debchangelog.vim.diff -p0
 155_rst.vim.diff -p0
 157_slrnrc.vim.diff -p0
-158_python.vim.diff -p0
 161_cmake-support.diff -p0
 201_fr.po.diff -p0
 203_zh_TW.UTF8.po.diff -p0