r593 - in trunk/vim7: debian patches
Stefano Zacchiroli
zack at costa.debian.org
Mon Apr 17 00:55:50 UTC 2006
Author: zack
Date: 2006-04-17 00:55:49 +0000 (Mon, 17 Apr 2006)
New Revision: 593
Removed:
trunk/vim7/patches/106_fstab.vim.diff
trunk/vim7/patches/111_fstab.vim.diff
trunk/vim7/patches/130_fstab.vim.diff
trunk/vim7/patches/133_resolv.vim.diff
Modified:
trunk/vim7/debian/changelog
trunk/vim7/debian/rules
trunk/vim7/patches/pushed-upstream.txt
trunk/vim7/patches/series
Log:
snapshot 7.0e
4 patches integrated upstream (yuppieee!!!)
Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/debian/changelog 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,8 +1,14 @@
-vim (1:6.4+7.0d05-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0e-1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream snapshot (7.0d05).
+ * New upstream snapshot (7.0e).
+ [ Stefano Zacchiroli ]
+ * Screening of patches no longer needed with vim7 & pushing upstream
+ of as many debian-specific patches as possible. Results:
+ + removed patches: 106_fstab.vim.diff, 111_fstab.vim.diff,
+ 130_fstab.vim.diff, 133_resolv.vim.diff
+
-- Stefano Zacchiroli <zack at debian.org> Sat, 15 Apr 2006 17:39:08 -0400
vim (1:6.4+7.0d03-1) experimental; urgency=low
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/debian/rules 2006-04-17 00:55:49 UTC (rev 593)
@@ -161,8 +161,8 @@
CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
NAME=vim
-VERSION=7.0d
-SNAPSHOT=05
+VERSION=7.0e
+SNAPSHOT=
DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
SRCDIR=$(NAME)$(subst .,,$(VERSION))
VIMCUR=$(SRCDIR)
Deleted: trunk/vim7/patches/106_fstab.vim.diff
===================================================================
--- trunk/vim7/patches/106_fstab.vim.diff 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/106_fstab.vim.diff 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,22 +0,0 @@
-Index: vim/runtime/syntax/fstab.vim
-===================================================================
---- vim/runtime/syntax/fstab.vim.orig
-+++ vim/runtime/syntax/fstab.vim
-@@ -32,7 +32,7 @@
- " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
-+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs none cifs
-
- " Options
- " -------
-@@ -44,7 +44,7 @@
- syn keyword fsOptionsYesNo yes no
- syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
- syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode
- syn match fsOptionsGeneral /_netdev/
-
- " Options: adfs
Deleted: trunk/vim7/patches/111_fstab.vim.diff
===================================================================
--- trunk/vim7/patches/111_fstab.vim.diff 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/111_fstab.vim.diff 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,33 +0,0 @@
-Index: vim/runtime/syntax/fstab.vim
-===================================================================
---- vim/runtime/syntax/fstab.vim.orig
-+++ vim/runtime/syntax/fstab.vim
-@@ -19,8 +19,8 @@
-
- " Device
- syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
--syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@]\|^\w\{-}\ze\W\)/ contained
--syn keyword fsDeviceKeyword contained none proc linproc tmpfs
-+syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:]\|^\w\{-}\ze\W\)/ contained
-+syn keyword fsDeviceKeyword contained none proc linproc tmpfs sysfs usbfs
- syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
- syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
-
-@@ -32,7 +32,7 @@
- " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs none cifs
-+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs none cifs sysfs
-
- " Options
- " -------
-@@ -44,7 +44,7 @@
- syn keyword fsOptionsYesNo yes no
- syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
- syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
- syn match fsOptionsGeneral /_netdev/
-
- " Options: adfs
Deleted: trunk/vim7/patches/130_fstab.vim.diff
===================================================================
--- trunk/vim7/patches/130_fstab.vim.diff 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/130_fstab.vim.diff 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,13 +0,0 @@
-Index: vim/runtime/syntax/fstab.vim
-===================================================================
---- vim/runtime/syntax/fstab.vim.orig
-+++ vim/runtime/syntax/fstab.vim
-@@ -44,7 +44,7 @@
- syn keyword fsOptionsYesNo yes no
- syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
- syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
-+syn keyword fsOptionsGeneral async atime auto bind current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
- syn match fsOptionsGeneral /_netdev/
-
- " Options: adfs
Deleted: trunk/vim7/patches/133_resolv.vim.diff
===================================================================
--- trunk/vim7/patches/133_resolv.vim.diff 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/133_resolv.vim.diff 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,13 +0,0 @@
-Index: vim/runtime/syntax/resolv.vim
-===================================================================
---- vim/runtime/syntax/resolv.vim.orig
-+++ vim/runtime/syntax/resolv.vim
-@@ -31,7 +31,7 @@
-
- " Particular
- syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\{1,3}/ contains=@resolvIPCluster
--syn match resolvHostnameSearch contained /\%(\w\{-}\.[-0-9A-Za-z_\.]\{-}\%(\s\|$\)\)\{1,6}/
-+syn match resolvHostnameSearch contained /\%([-0-9A-Za-z_]\{-}\.[-0-9A-Za-z_\.]\{-}\%(\s\|$\)\)\{1,6}/
- syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?\%(\s\|$\)\)\{1,10}/ contains=resolvOperator, at resolvIPCluster
-
- " Identifiers
Modified: trunk/vim7/patches/pushed-upstream.txt
===================================================================
--- trunk/vim7/patches/pushed-upstream.txt 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/pushed-upstream.txt 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,20 +1,6 @@
Documenting the attempt of pushing patches upstream before the vim7 release.
-106_fstab.vim.diff
-111_fstab.vim.diff
-130_fstab.vim.diff
-
- Signaled to Bram and maintainer
- Sun, 26 Mar 2006 11:38:13 -0500 zack
- Pinged again about Bram's last call, proposed hijacking by
- pkg-vim-maintainers: Wed, 12 Apr 2006 12:29:14 -0400 zack
- pkg-vim-maintainers version ready in svn
- Bram found a new maintainer, informed him, still no answer:
- Fri, 14 Apr 2006 15:26:33 -0400 zack
- Maintenance took over by David Necas, will send new version integrating this
- patches to Bram today. Sun, 16 Apr 2006 11:03:05 -0400 zack
-
108_automake.vim.diff
Signaled to maintainer and Bram
@@ -27,14 +13,6 @@
Mon, 27 Mar 2006 09:10:15 -0500 zack
Pinged again about Bram's last call: Thu, 13 Apr 2006 10:39:39 -0400 zack
-133_resolv.vim.diff
-
- Signaled to maintainer and Bram
- Tue, 28 Mar 2006 22:48:15 -0500 zack
- Pinged again about Bram's last call: Thu, 13 Apr 2006 10:37:40 -0400 zack
- Maintenance took over by David Necas, will send new version integrating this
- patches to Bram today. Sun, 16 Apr 2006 11:03:05 -0400 zack
-
136_muttrc.vim.diff
140_muttrc.vim.diff
Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series 2006-04-16 15:03:35 UTC (rev 592)
+++ trunk/vim7/patches/series 2006-04-17 00:55:49 UTC (rev 593)
@@ -1,12 +1,8 @@
102_pythoncomplete.vim.diff -p0
104_debchangelog.vim.diff -p0
-106_fstab.vim.diff -p0
108_automake.vim.diff -p0
109_xdefaults.vim.diff -p0
-111_fstab.vim.diff -p0
119_php.vim.diff -p0
-130_fstab.vim.diff -p0
-133_resolv.vim.diff -p0
136_muttrc.vim.diff -p0
140_muttrc.vim.diff -p0
148_debchangelog.vim.diff -p0
More information about the pkg-vim-maintainers
mailing list