r635 - in /branches/packages/vim/vim7: debian/changelog debian/rules debian/runtime/debian.vim debian/runtime/gvimrc debian/runtime/vimrc debian/vim-common.install.in patches/101_debcontrol.vim.diff patches/series

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Mon May 1 14:16:37 UTC 2006


Author: jamessan
Date: Mon May  1 14:16:36 2006
New Revision: 635

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=635
Log:
Update to 7.0g snapshot.
Add 101_debcontrol.vim.diff patch.
Move default settings from /etc/vim/{g,}vimrc to debian.vim (need to add a NEWS
  entry for this before uploading).

Added:
    branches/packages/vim/vim7/debian/runtime/debian.vim
    branches/packages/vim/vim7/patches/101_debcontrol.vim.diff
Modified:
    branches/packages/vim/vim7/debian/changelog
    branches/packages/vim/vim7/debian/rules
    branches/packages/vim/vim7/debian/runtime/gvimrc
    branches/packages/vim/vim7/debian/runtime/vimrc
    branches/packages/vim/vim7/debian/vim-common.install.in
    branches/packages/vim/vim7/patches/series

Modified: branches/packages/vim/vim7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/changelog?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/changelog (original)
+++ branches/packages/vim/vim7/debian/changelog Mon May  1 14:16:36 2006
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0f04-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0g-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0f04).
+  * New upstream snapshot (7.0g).
     + Remove 161_cmake-support.diff, merged upstream.
     + Recognize zsh-beta as a shell that supports '2>&1| tee' for the
       'shellpipe' option. (closes: #362999)
@@ -19,16 +19,17 @@
     + 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,
-      syntax/php.vim, syntax/slrnrc.vim, syntax/tpp.vim,
-      lang/po/zh_TW.UTF-8.po.
-    + syntax/debchangelog.vim is now officially maintained upstream by Debian
-      VIM Maintainers
+      syntax/php.vim, syntax/slrnrc.vim, lang/po/zh_TW.UTF-8.po.
+    + syntax/debchangelog.vim and syntax/tpp.vim are now officially
+      co-maintained upstream by Debian Vim Maintainers
 
   [ James Vega ]
   * Add Replaces against manpages-it and manpages-pl since upstream now
     provides i10n manpages. (closes: #364299)
-
- -- James Vega <jamessan at debian.org>  Sun, 23 Apr 2006 00:58:01 -0400
+  * Add 101_debcontrol.vim.diff, which supports recognition of all
+    architectures listed at http://www.debian.org/ports/ (closes: 364824)
+
+ -- James Vega <jamessan at debian.org>  Mon,  1 May 2006 10:12:25 -0400
 
 vim (1:6.4+7.0d03-1) experimental; urgency=low
 

Modified: branches/packages/vim/vim7/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/rules?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/rules (original)
+++ branches/packages/vim/vim7/debian/rules Mon May  1 14:16:36 2006
@@ -161,8 +161,8 @@
 CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
 
 NAME=vim
-VERSION=7.0f
-SNAPSHOT=04
+VERSION=7.0g
+SNAPSHOT=
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Added: branches/packages/vim/vim7/debian/runtime/debian.vim
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/runtime/debian.vim?rev=635&op=file
==============================================================================
--- branches/packages/vim/vim7/debian/runtime/debian.vim (added)
+++ branches/packages/vim/vim7/debian/runtime/debian.vim Mon May  1 14:16:36 2006
@@ -1,0 +1,63 @@
+" Configuration file for vim
+set runtimepath=~/.vim,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,~/.vim/after
+
+" Normally we use vim-extensions. If you want true vi-compatibility
+" remove change the following statements
+set nocompatible	" Use Vim defaults instead of 100% vi compatibility
+set backspace=indent,eol,start	" more powerful backspacing
+
+" Now we set some defaults for the editor
+set autoindent		" always set autoindenting on
+" set linebreak		" Don't wrap words by default
+set textwidth=0		" Don't wrap lines by default
+set viminfo='20,\"50	" read/write a .viminfo file, don't store more than
+			" 50 lines of registers
+set history=50		" keep 50 lines of command line history
+set ruler		" show the cursor position all the time
+
+" Suffixes that get lower priority when doing tab completion for filenames.
+" These are files we are not likely to want to edit or read.
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
+
+" We know xterm-debian is a color terminal
+if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
+  set t_Co=16
+  set t_Sf=[3%dm
+  set t_Sb=[4%dm
+endif
+
+if has("autocmd")
+ " Enabled file type detection
+ " Use the default filetype settings. If you also want to load indent files
+ " to automatically do language-dependent indenting add 'indent' as well.
+ filetype plugin on
+
+endif " has ("autocmd")
+
+" Some Debian-specific things
+if has("autocmd")
+  augroup filetype
+    au BufRead reportbug.*		set ft=mail
+    au BufRead reportbug-*		set ft=mail
+  augroup END
+endif
+
+" Set paper size from /etc/papersize if available (Debian-specific)
+if filereadable("/etc/papersize")
+  try
+    let s:shellbak = &shell
+    let &shell="/bin/sh"
+    let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
+    let &shell=s:shellbak
+    if strlen(s:papersize)
+      let &printoptions = "paper:" . s:papersize
+    endif
+  catch /^Vim\%((\a\+)\)\=:E145/
+  endtry
+endif
+
+if has('gui_running')
+  " Make shift-insert work like in Xterm
+  map <S-Insert> <MiddleMouse>
+  map! <S-Insert> <MiddleMouse>
+endif

Modified: branches/packages/vim/vim7/debian/runtime/gvimrc
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/runtime/gvimrc?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/runtime/gvimrc (original)
+++ branches/packages/vim/vim7/debian/runtime/gvimrc Mon May  1 14:16:36 2006
@@ -1,29 +1,9 @@
-" Configuration file for gvim
-" Written for Debian GNU/Linux by W.Akkerman <wakkerma at debian.org>
-
 " Make external commands work through a pipe instead of a pseudo-tty
 "set noguipty
-" Switch syntax highlighting on, when the terminal has colors
 
-" Make shift-insert work like in Xterm
-map <S-Insert> <MiddleMouse>
-map! <S-Insert> <MiddleMouse>
-
-" Also switch on highlighting the last used search pattern.
-if has("syntax") && (&t_Co > 2 || has("gui_running"))
-  syntax on
-  set hlsearch
-endif
-
-" Extensions by i18n teams
-if filereadable( "/etc/vim/langrc/" . $LANG . ".vim" )
-   exe "so " . "/etc/vim/langrc/" . $LANG . ".vim"
-endif
-
-" You can also specify a different font, overriding the default font and the
-" one from the hooks above:
-" set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
-
-if filereadable("/etc/vim/gvimrc.local")
-  source /etc/vim/gvimrc.local
-endif
+" You can also specify a different font, overriding the default font
+" if has('gui_gtk2')
+"   set guifont=Bitstream\ Vera\ Sans\ Mono\ 12
+" else
+"   set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+" endif

Modified: branches/packages/vim/vim7/debian/runtime/vimrc
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/runtime/vimrc?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/runtime/vimrc (original)
+++ branches/packages/vim/vim7/debian/runtime/vimrc Mon May  1 14:16:36 2006
@@ -1,30 +1,12 @@
-" Configuration file for vim
-set runtimepath=~/.vim,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,~/.vim/after
+" All system-wide defaults maintained by pkg-vim-maintainers are set in
+" $VIMRUNTIME/debian.vim and loaded by the following call to runtime.  If you
+" wish to change any of those settings, that should be done in this file since
+" debian.vim will be overwritten everytime an upgrade is performed.
+runtime debian.vim
 
-" Normally we use vim-extensions. If you want true vi-compatibility
-" remove change the following statements
-set nocompatible	" Use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start	" more powerful backspacing
-
-" Now we set some defaults for the editor
-set autoindent		" always set autoindenting on
-" set linebreak		" Don't wrap words by default
-set textwidth=0		" Don't wrap lines by default
-set viminfo='20,\"50	" read/write a .viminfo file, don't store more than
-			" 50 lines of registers
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-
-" Suffixes that get lower priority when doing tab completion for filenames.
-" These are files we are not likely to want to edit or read.
-set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
-
-" We know xterm-debian is a color terminal
-if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
-  set t_Co=16
-  set t_Sf=[3%dm
-  set t_Sb=[4%dm
-endif
+" NOTE: debian.vim sets 'nocompatible'.  Setting 'compatible' changes numerous
+" options, so any other options should be set AFTER setting 'compatible'.
+" set compatible
 
 " Vim5 and later versions support syntax highlighting. Uncommenting the next
 " line enables syntax highlighting by default.
@@ -34,42 +16,12 @@
 " turn on this option as well
 " set background=dark
 
-if has("autocmd")
- " Enabled file type detection
- " Use the default filetype settings. If you also want to load indent files
- " to automatically do language-dependent indenting add 'indent' as well.
- filetype plugin on
-
-endif " has ("autocmd")
-
-" Some Debian-specific things
-if has("autocmd")
-  augroup filetype
-    au BufRead reportbug.*		set ft=mail
-    au BufRead reportbug-*		set ft=mail
-  augroup END
-endif
-
 " Uncomment the following to have Vim jump to the last position when
 " reopening a file
 " if has("autocmd")
 "   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
 "                    \| exe "normal g'\"" | endif
 " endif
-
-" Set paper size from /etc/papersize if available (Debian-specific)
-if filereadable("/etc/papersize")
-  try
-    let s:shellbak = &shell
-    let &shell="/bin/sh"
-    let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
-    let &shell=s:shellbak
-    if strlen(s:papersize)
-      let &printoptions = "paper:" . s:papersize
-    endif
-  catch /^Vim\%((\a\+)\)\=:E145/
-  endtry
-endif
 
 " The following are commented out as they cause vim to behave a lot
 " different from regular vi. They are highly recommended though.
@@ -78,8 +30,3 @@
 "set ignorecase		" Do case insensitive matching
 "set incsearch		" Incremental search
 "set autowrite		" Automatically save before commands like :next and :make
-
-" Source a global configuration file if available
-if filereadable("/etc/vim/vimrc.local")
-  source /etc/vim/vimrc.local
-endif

Modified: branches/packages/vim/vim7/debian/vim-common.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/vim-common.install.in?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/vim-common.install.in (original)
+++ branches/packages/vim/vim7/debian/vim-common.install.in Mon May  1 14:16:36 2006
@@ -1,5 +1,6 @@
 debian/tmp/usr/bin/xxd                           usr/bin/
 debian/helpztags                                 usr/bin/
 debian/runtime/vimrc                             etc/vim/
+debian/runtime/debian.vim                        usr/share/vim/vimcommon/
 debian/vim.presubj                               usr/share/bug/vim/
 debian/tmp/usr/share/man/man1/*                  usr/share/man/man1/

Added: branches/packages/vim/vim7/patches/101_debcontrol.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/patches/101_debcontrol.vim.diff?rev=635&op=file
==============================================================================
--- branches/packages/vim/vim7/patches/101_debcontrol.vim.diff (added)
+++ branches/packages/vim/vim7/patches/101_debcontrol.vim.diff Mon May  1 14:16:36 2006
@@ -1,0 +1,13 @@
+Index: vim/runtime/syntax/debcontrol.vim
+===================================================================
+--- vim/runtime/syntax/debcontrol.vim.orig
++++ vim/runtime/syntax/debcontrol.vim
+@@ -25,7 +25,7 @@
+ syn match debControlSpace " "
+ 
+ " Define some common expressions we can use later on
+-syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\|hppa\|i386\|ia64\|m68k\|mipsel\|mips\|powerpc\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-i386\|knetbsd-i386\|netbsd-i386\)"
++syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(eb\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
+ syn match debcontrolName contained "[a-z][a-z0-9+-]*"
+ syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
+ syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"

Modified: branches/packages/vim/vim7/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/patches/series?rev=635&op=diff
==============================================================================
--- branches/packages/vim/vim7/patches/series (original)
+++ branches/packages/vim/vim7/patches/series Mon May  1 14:16:36 2006
@@ -1,1 +1,2 @@
+101_debcontrol.vim.diff -p0
 109_xdefaults.vim.diff -p0




More information about the pkg-vim-maintainers mailing list