r574 - in trunk/vim7: debian patches

Stefano Zacchiroli zack at costa.debian.org
Fri Apr 7 14:25:16 UTC 2006


Author: zack
Date: 2006-04-07 14:25:14 +0000 (Fri, 07 Apr 2006)
New Revision: 574

Removed:
   trunk/vim7/patches/101_make.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/series
Log:
snapshot 7.0c11


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-04-06 15:53:13 UTC (rev 573)
+++ trunk/vim7/debian/changelog	2006-04-07 14:25:14 UTC (rev 574)
@@ -1,12 +1,13 @@
-vim (1:6.4+7.0c10-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0c11-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0c10).
+  * New upstream snapshot (7.0c11).
 
   [ Stefano Zacchiroli ]
   * Screening of patches no longer needed with vim7 & pushing upstream
     of as many debian-specific patches as possible. Results:
-    + removed patches: 135_debsources.vim.diff, 145_fortran.vim.diff
+    + removed patches: 101_make.vim.diff, 135_debsources.vim.diff,
+      145_fortran.vim.diff
     + removed updates: debian/updates/debsources.vim
 
  -- James Vega <jamessan at debian.org>  Wed,  5 Apr 2006 09:16:42 -0400

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-04-06 15:53:13 UTC (rev 573)
+++ trunk/vim7/debian/rules	2006-04-07 14:25:14 UTC (rev 574)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0c
-SNAPSHOT=10
+SNAPSHOT=11
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/101_make.vim.diff
===================================================================
--- trunk/vim7/patches/101_make.vim.diff	2006-04-06 15:53:13 UTC (rev 573)
+++ trunk/vim7/patches/101_make.vim.diff	2006-04-07 14:25:14 UTC (rev 574)
@@ -1,21 +0,0 @@
-Index: vim/runtime/syntax/make.vim
-===================================================================
---- vim/runtime/syntax/make.vim.orig
-+++ vim/runtime/syntax/make.vim
-@@ -17,11 +17,11 @@
- syn match makeNextLine	"\\\n\s*"
- 
- " some directives
--syn match makePreCondit	"^\s*\(ifeq\>\|else\>\|endif\>\|ifneq\>\|ifdef\>\|ifndef\>\)"
--syn match makeInclude	"^\s*[-s]\=include"
--syn match makeStatement	"^\s*vpath"
--syn match makeExport    "^\s*\(export\|unexport\)\>"
--syn match makeOverride	"^\s*override"
-+syn match makePreCondit        "^ *\(ifeq\>\|else\>\|endif\>\|ifneq\>\|ifdef\>\|ifndef\>\)"
-+syn match makeInclude  "^ *[-s]\=include"
-+syn match makeStatement        "^ *vpath"
-+syn match makeExport    "^ *\(export\|unexport\)\>"
-+syn match makeOverride "^ *override"
- hi link makeOverride makeStatement
- hi link makeExport makeStatement
- 

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-04-06 15:53:13 UTC (rev 573)
+++ trunk/vim7/patches/series	2006-04-07 14:25:14 UTC (rev 574)
@@ -1,4 +1,3 @@
-101_make.vim.diff -p0
 102_pycomplete.vim.diff -p0
 103_sh.vim.diff -p0
 104_debchangelog.vim.diff -p0




More information about the pkg-vim-maintainers mailing list