r583 - in trunk/vim7: debian patches

[Stefano Zacchiroli]

Author: zack
Date: 2006-04-11 23:28:26 +0000 (Tue, 11 Apr 2006)
New Revision: 583

Removed:
   trunk/vim7/patches/122_html_indent.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/pushed-upstream.txt
   trunk/vim7/patches/series
Log:
snapshot 7.0d01

Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-04-10 17:38:10 UTC (rev 582)
+++ trunk/vim7/debian/changelog	2006-04-11 23:28:26 UTC (rev 583)
@@ -1,8 +1,11 @@
-vim (1:6.4+7.0d-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0d01-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0d).
-    + TODO briefly describe new features here
+  * New upstream snapshot (7.0d01).
+    + 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.
+      See ":help version7" for more information.
     + bugfixes affecting Debian's BTS:
       - new version of bash syntax highlighting (closes: #355273, #361813)
       - respect LC_MESSAGES in menus (closes: #147757, #217217)
@@ -18,11 +21,11 @@
   [ 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, 135_debsources.vim.diff,
-      145_fortran.vim.diff, 155_rst.vim.diff
+    + removed patches: 101_make.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>  Mon, 10 Apr 2006 13:25:48 -0400
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 11 Apr 2006 19:23:16 -0400 zack
 
 vim (1:6.4+7.0c05-1) experimental; urgency=low
 

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-04-10 17:38:10 UTC (rev 582)
+++ trunk/vim7/debian/rules	2006-04-11 23:28:26 UTC (rev 583)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0d
-SNAPSHOT=
+SNAPSHOT=01
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/122_html_indent.vim.diff
===================================================================
--- trunk/vim7/patches/122_html_indent.vim.diff	2006-04-10 17:38:10 UTC (rev 582)
+++ trunk/vim7/patches/122_html_indent.vim.diff	2006-04-11 23:28:26 UTC (rev 583)
@@ -1,13 +0,0 @@
-Index: vim/runtime/indent/html.vim
-===================================================================
---- vim/runtime/indent/html.vim.orig
-+++ vim/runtime/indent/html.vim
-@@ -14,7 +14,7 @@
- 
- " [-- local settings (must come before aborting the script) --]
- setlocal indentexpr=HtmlIndentGet(v:lnum)
--setlocal indentkeys=o,O,*<Return>,<>>,<bs>,{,}
-+setlocal indentkeys=o,O,*<Return>,<>>,{,}
- 
- 
- if exists('g:html_indent_tags')

Modified: trunk/vim7/patches/pushed-upstream.txt
===================================================================
--- trunk/vim7/patches/pushed-upstream.txt	2006-04-10 17:38:10 UTC (rev 582)
+++ trunk/vim7/patches/pushed-upstream.txt	2006-04-11 23:28:26 UTC (rev 583)
@@ -23,11 +23,6 @@
   Signaled to maintainer and Bram
   Mon, 27 Mar 2006 09:10:15 -0500 zack
 
-122_html_indent.vim.diff
-
-  Signaled to maintainer and Bram
-  Mon, 10 Apr 2006 10:05:06 -0400 zack
-
 133_resolv.vim.diff
 
   Signaled to maintainer and Bram

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-04-10 17:38:10 UTC (rev 582)
+++ trunk/vim7/patches/series	2006-04-11 23:28:26 UTC (rev 583)
@@ -7,7 +7,6 @@
 111_fstab.vim.diff -p0
 117_fortran.vim.diff -p0
 119_php.vim.diff -p0
-122_html_indent.vim.diff -p0
 130_fstab.vim.diff -p0
 133_resolv.vim.diff -p0
 136_muttrc.vim.diff -p0