r1024 - in /trunk/packages/vim: debian/changelog debian/control patches/debcontrol.vim.diff

Fri Sep 21 19:37:25 UTC 2007

Author: jamessan
Date: Fri Sep 21 19:37:24 2007
New Revision: 1024

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1024
Log:
* Update debcontrol.vim.diff to recognize "Homepage:" (Closes: #443444) and
  "XS-Vcs-*:" fields.
* Add Homepage field to debian/control.

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control
    trunk/packages/vim/patches/debcontrol.vim.diff

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1024&op=diff
==============================================================================

--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Fri Sep 21 19:37:24 2007
@@ -10,8 +10,11 @@
   [ James Vega ]
   * Add a slave link for gnome-text-editor.1.gz when we add the
     gnome-text-editor alternative.  (Closes: #439549)
-
- -- James Vega <jamessan at debian.org>  Wed, 19 Sep 2007 10:27:13 -0400
+  * Update debcontrol.vim.diff to recognize "Homepage:" (Closes: #443444) and
+    "XS-Vcs-*:" fields.
+  * Add Homepage field to debian/control.
+
+ -- James Vega <jamessan at debian.org>  Fri, 21 Sep 2007 15:36:21 -0400
 
 vim (1:7.1-056+2) unstable; urgency=low
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=1024&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Fri Sep 21 19:37:24 2007
@@ -8,6 +8,7 @@
 Build-Conflicts: libperl-dev (= 5.8.4-1)
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/
+Homepage: http://www.vim.org/
 
 Package: vim-common
 Priority: important

Modified: trunk/packages/vim/patches/debcontrol.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/debcontrol.vim.diff?rev=1024&op=diff
==============================================================================
--- trunk/packages/vim/patches/debcontrol.vim.diff (original)
+++ trunk/packages/vim/patches/debcontrol.vim.diff Fri Sep 21 19:37:24 2007
@@ -2,23 +2,42 @@
 ===================================================================
 --- vim/runtime/syntax/debcontrol.vim.orig
 +++ vim/runtime/syntax/debcontrol.vim
-@@ -25,8 +25,8 @@
- syn match debControlSpace " "
+@@ -26,7 +26,7 @@
  
  " Define some common expressions we can use later on
--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 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 debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(eb\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390\|s390x\|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 debcontrolVariable contained "\${.\{-}}"
-@@ -45,7 +45,7 @@
+@@ -36,7 +36,7 @@
+ syn match	debcontrolEmail	"<.\{-}>"
+ 
+ " List of all legal keys
+-syn match debcontrolKey contained "^\(Source\|Package\|Section\|Priority\|Maintainer\|Uploaders\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Architecture\|Description\|Bugs\|Origin\|Enhances\): *"
++syn match debcontrolKey contained "^\(Source\|Package\|Section\|Priority\|Maintainer\|Uploaders\|Build-Depends\|Build-Conflicts\|Build-Depends-Indep\|Build-Conflicts-Indep\|Standards-Version\|Pre-Depends\|Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Essential\|Architecture\|Description\|Bugs\|Origin\|Enhances\|Homepage\|XS-Vcs-\a\+\): *"
+ 
+ " Fields for which we do strict syntax checking
+ syn region debcontrolStrictField start="^Architecture" end="$" contains=debcontrolKey,debcontrolArchitecture,debcontrolSpace oneline
+@@ -44,8 +44,11 @@
+ syn region debcontrolStrictField start="^Priority" end="$" contains=debcontrolKey,debcontrolPriority oneline
  syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
  
++" #-Comments
++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\):" 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\):" 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\|Homepage\|XS-Vcs-\a\+\):" 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
+@@ -67,6 +70,7 @@
+   HiLink debcontrolSection	Normal
+   HiLink debcontrolVariable	Identifier
+   HiLink debcontrolEmail	Identifier
++  HiLink debcontrolComment	Comment
+   HiLink debcontrolElse		Special
+ 
+   delcommand HiLink


