r1081 - in /trunk/packages/vim: debian/README debian/changelog debian/gvim.desktop patches/debsources.vim-syntax.diff patches/series runtime/syntax/debchangelog.vim runtime/syntax/debcontrol.vim upstream/patches/7.1.155

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sat Nov 10 22:40:07 UTC 2007


Author: jamessan
Date: Sat Nov 10 22:40:07 2007
New Revision: 1081

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1081
Log:
* New upstream patches (139 - 155), see README.gz for details.
* runtime/ftplugin/debchangelog.vim:
* runtime/syntax/debchangelog.vim:
  - Recognize oldstable* upload targets.
* debian/gvim.desktop:
  - Add TryExec key so the menu entry is only shown if the gvim alternative
    has been setup.
* Merges from Ubuntu:
  - runtime/syntax/debcontrol.vim:
    + Recognize restricted, universe, multiverse as part of the Section
      field.
    + Recognize XSBC-Original-Maintainer as a legal field.
  - runtime/syntax/debchangelog.vim:
    + Recognize Ubuntu releases as upload targets.
    + Recognize syntax for closing Launchpad bugs.
  - runtime/syntax/debsources.vim:
    + Recognize restricted, universe, multiverse Sections.
    + Add more recent Ubuntu releases as recognized distributions.

Added:
    trunk/packages/vim/patches/debsources.vim-syntax.diff
    trunk/packages/vim/upstream/patches/7.1.155
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/gvim.desktop
    trunk/packages/vim/patches/series
    trunk/packages/vim/runtime/syntax/debchangelog.vim
    trunk/packages/vim/runtime/syntax/debcontrol.vim

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Nov 10 22:40:07 2007
@@ -183,3 +183,4 @@
   3183  7.1.152  display problem when 'hls' and 'cursorcolumn' are set
   4610  7.1.153  compiler warnings on SGI
   1547  7.1.154  (after 7.1.152) compiler warning for signed/unsigned compare
+  1594  7.1.155  crash when 'undolevels' is 0 and repeating "udd"

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Nov 10 22:40:07 2007
@@ -1,14 +1,16 @@
-vim (1:7.1-154+1) UNRELEASED; urgency=low
+vim (1:7.1-155+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (139 - 154), see README.gz for details.
+  * New upstream patches (139 - 155), see README.gz for details.
 
   [ James Vega ]
-  * ftplugin/debchangelog.vim:
+  * runtime/ftplugin/debchangelog.vim:
     - Fix NewVersion() to use the distribution from the previous changelog
       entry.  (Closes: #446728)
     - Fix NewVersion() to increment the version of the first changelog entry
       regardless of how 'startofline' is set.
+  * runtime/syntax/debchangelog.vim:
+    - Recognize oldstable* upload targets.
   * Refreshed patches:
     - vimrc.tiny.diff
   * Added patches:
@@ -28,8 +30,22 @@
     - Make use of multi-line (Build-)Depends support.
   * debian/rules:
     - Add binary-arch target for the vim-dbg package.
-
- -- James Vega <jamessan at debian.org>  Sat, 10 Nov 2007 00:48:17 -0500
+  * debian/gvim.desktop:
+    - Add TryExec key so the menu entry is only shown if the gvim alternative
+      has been setup.
+  * Merges from Ubuntu:
+    - runtime/syntax/debcontrol.vim:
+      + Recognize restricted, universe, multiverse as part of the Section
+        field.
+      + Recognize XSBC-Original-Maintainer as a legal field.
+    - runtime/syntax/debchangelog.vim:
+      + Recognize Ubuntu releases as upload targets.
+      + Recognize syntax for closing Launchpad bugs.
+    - runtime/syntax/debsources.vim:
+      + Recognize restricted, universe, multiverse Sections.
+      + Add more recent Ubuntu releases as recognized distributions.
+
+ -- James Vega <jamessan at debian.org>  Sat, 10 Nov 2007 17:38:40 -0500
 
 vim (1:7.1-138+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/debian/gvim.desktop
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/gvim.desktop?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/debian/gvim.desktop (original)
+++ trunk/packages/vim/debian/gvim.desktop Sat Nov 10 22:40:07 2007
@@ -69,6 +69,7 @@
 Comment[wa]=Asspougnî des fitchîs tecses
 Comment[zh_CN]=编辑文本文件
 Comment[zh_TW]=編輯文字檔
+TryExec=gvim
 Exec=gvim -f %F
 Terminal=false
 Type=Application

Added: trunk/packages/vim/patches/debsources.vim-syntax.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/debsources.vim-syntax.diff?rev=1081&op=file
==============================================================================
--- trunk/packages/vim/patches/debsources.vim-syntax.diff (added)
+++ trunk/packages/vim/patches/debsources.vim-syntax.diff Sat Nov 10 22:40:07 2007
@@ -1,0 +1,21 @@
+Index: vim/runtime/syntax/debsources.vim
+===================================================================
+--- vim/runtime/syntax/debsources.vim.orig
++++ vim/runtime/syntax/debsources.vim
+@@ -19,14 +19,14 @@
+ syn case match
+ 
+ " A bunch of useful keywords
+-syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\)/
++syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse)/
+ 
+ " Match comments
+ syn match debsourcesComment        /#.*/
+ 
+ " Match uri's
+ syn match debsourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
+-syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
++syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(sarge\|etch\|\(old\)\=stable\|testing\|unstable\|sid\|experimental\|dapper\|edgy\|feisty\|gutsy\|hardy\)\([-[:alnum:]_./]*\)+
+ 
+ " Associate our matches and regions with pretty colours
+ hi def link debsourcesLine            Error

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sat Nov 10 22:40:07 2007
@@ -21,3 +21,5 @@
 samba.vim.diff -p0
 tex.vim-syntax_additions.diff -p0
 sh.vim_syntax.diff -p0
+gnuada.diff -p0
+debsources.vim-syntax.diff -p0

Modified: trunk/packages/vim/runtime/syntax/debchangelog.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/syntax/debchangelog.vim?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/runtime/syntax/debchangelog.vim (original)
+++ trunk/packages/vim/runtime/syntax/debchangelog.vim Sat Nov 10 22:40:07 2007
@@ -19,16 +19,17 @@
 " Define some common expressions we can use later on
 syn match debchangelogName	contained "^[[:alpha:]][[:alnum:].+-]\+ "
 syn match debchangelogUrgency	contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
-syn match debchangelogTarget	contained "\( stable\| frozen\| unstable\| testing-proposed-updates\| experimental\| \%(sarge\|etch\)-backports\| \%(sarge\|etch\)-volatile\| stable-security\| testing-security\)\+"
+syn match debchangelogTarget	contained "\( \(old\)\=stable\| frozen\| unstable\| testing-proposed-updates\| experimental\| \%(sarge\|etch\)-backports\| \%(sarge\|etch\)-volatile\| \(old\)\=stable-security\| testing-security\| \(dapper\|edgy\|feisty\|gutsy\|hardy\)\(-\(security\|proposed\|updates\|backports\|commercial\|partner\)\)\?\)\+"
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\s*\(bug\)\=#\=\s\=\d\+\(,\s*\(bug\)\=#\=\s\=\d\+\)*"
+syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
 syn match debchangelogEmail	contained "[_=[:alnum:].+-]\+@[[:alnum:]./\-]\+"
 syn match debchangelogEmail	contained "<.\{-}>"
 
 " Define the entries that make up the changelog
 syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogUrgency,debchangelogTarget,debchangelogVersion oneline
 syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail oneline
-syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses oneline
+syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
 if version >= 508 || !exists("did_debchangelog_syn_inits")

Modified: trunk/packages/vim/runtime/syntax/debcontrol.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/syntax/debcontrol.vim?rev=1081&op=diff
==============================================================================
--- trunk/packages/vim/runtime/syntax/debcontrol.vim (original)
+++ trunk/packages/vim/runtime/syntax/debcontrol.vim Sat Nov 10 22:40:07 2007
@@ -28,7 +28,7 @@
 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-z0-9][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\)"
+syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\(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\)"
 syn match debcontrolPackageType contained "u\?deb"
 syn match debcontrolVariable contained "\${.\{-}}"
 
@@ -58,7 +58,7 @@
 syn match debcontrolComment "^#.*$"
 
 " Catch-all for the other legal fields
-syn region debcontrolField start="^\(Maintainer\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Bugs\|Origin\|Enhances\|X\(S\|B\)-Python-Version\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
+syn region debcontrolField start="^\(Maintainer\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Bugs\|Origin\|Enhances\|X\(S\|B\)-Python-Version\|XSBC-Original-Maintainer\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
 syn region debcontrolMultiField start="^\(Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ ]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable
 
 " Associate our matches and regions with pretty colours

Added: trunk/packages/vim/upstream/patches/7.1.155
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.155?rev=1081&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.155 (added)
+++ trunk/packages/vim/upstream/patches/7.1.155 Sat Nov 10 22:40:07 2007
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.155
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.155
+Problem:    Crash when 'undolevels' is 0 and repeating "udd". (James Vega)
+Solution:   When there is only one branch use u_freeheader() to delete it.
+Files:	    src/undo.c
+
+
+*** ../vim-7.1.154/src/undo.c	Mon Oct  1 22:53:27 2007
+--- src/undo.c	Sat Nov 10 13:45:28 2007
+***************
+*** 1677,1682 ****
+--- 1677,1690 ----
+      u_header_T	    **uhpp;	/* if not NULL reset when freeing this header */
+  {
+      u_header_T	    *tofree, *next;
++ 
++     /* If this is the top branch we may need to use u_freeheader() to update
++      * all the pointers. */
++     if (uhp == buf->b_u_oldhead)
++     {
++ 	u_freeheader(buf, uhp, uhpp);
++ 	return;
++     }
+  
+      if (uhp->uh_alt_prev != NULL)
+  	uhp->uh_alt_prev->uh_alt_next = NULL;
+*** ../vim-7.1.154/src/version.c	Thu Nov  8 21:23:34 2007
+--- src/version.c	Sat Nov 10 22:49:40 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     155,
+  /**/
+
+-- 
+I AM THANKFUL...
+...for the piles of laundry and ironing because it means I
+have plenty of clothes to wear.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///




More information about the pkg-vim-maintainers mailing list