r55 - in trunk/vim/debian: . updates

[Pierre Habouzit]

Author: madcoder-guest
Date: 2005-03-15 08:45:29 +0100 (Tue, 15 Mar 2005)
New Revision: 55

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/updates/debcontrol.vim
Log:
various debcontrol related bugs

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-15 07:29:45 UTC (rev 54)
+++ trunk/vim/debian/changelog	2005-03-15 07:45:29 UTC (rev 55)
@@ -4,11 +4,14 @@
     + Added Pierre Habouzit, Torsten Landschoff, Matthijs Mohlmann and Stefano
       Zacchiroli to uploaders. (closes: #299446)
     + Use $DEBFULLNAME and $DEBEMAIL to generate --with-compiledby value.
-  
+
   * Pierre Habouzit <pierre.habouzit@m4x.org>:
-    + Document the /etc/vim/{g,}vimrc.local files in README.Debian
+    + Document the /etc/vim/{g,}vimrc.local files in README.Debian.
+    + Fix some debcontrol.vim issues:
+      - don't search emails in fields that have not one (closes: #114508).
+      - fix debcontrolName according to Policy (closes: #148144).
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 15 Mar 2005 08:28:32 +0100
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 15 Mar 2005 08:37:59 +0100
 
 vim (1:6.3-064+1) unstable; urgency=low
 

Modified: trunk/vim/debian/updates/debcontrol.vim
===================================================================
--- trunk/vim/debian/updates/debcontrol.vim	2005-03-15 07:29:45 UTC (rev 54)
+++ trunk/vim/debian/updates/debcontrol.vim	2005-03-15 07:45:29 UTC (rev 55)
@@ -26,7 +26,7 @@
 
 " 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 debcontrolName contained "[a-z][a-z0-9+-]*"
+syn match debcontrolName contained "\<\([a-z][a-z0-9+-.]\+\|[0-9+-.][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\)"
 syn match debcontrolVariable contained "\${.\{-}}"
@@ -45,8 +45,9 @@
 syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
 
 " 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\):" 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
+syn region debcontrolField start="^\(Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Origin\):" end="$" contains=debcontrolKey,debcontrolVariable oneline
+syn region debcontrolField start="^\(Maintainer\|Bugs\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
+syn region debcontrolMultiField start="^\(Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ ]"me=s-1 contains=debcontrolKey,debcontrolEmail
 
 " Associate our matches and regions with pretty colours
 if version >= 508 || !exists("did_debcontrol_syn_inits")