[vim] 01/02: debcontrol.vim: Add support for Build-(Depends|Conflicts)-Arch

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/experimental
in repository vim.

commit 940e94bd98cdee5bd23773cbbcb3eddc4eaf2ec8
Author: James McCoy <jamessan at debian.org>
Date:   Wed Jul 5 22:01:53 2017 -0400

    debcontrol.vim: Add support for Build-(Depends|Conflicts)-Arch
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 ...dd-support-for-Build-Depends-Conflicts-Ar.patch | 40 ++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f8e7d96..9b32c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ vim (2:8.0.0691-1) UNRELEASED; urgency=medium
     + Disable ruby for vim-gtk3
   * d/rules:
     + Remove src/po/vim.pot and *.pyc during clean
+  * debcontrol.vim:
+    + Add highlighting for Build-(Depends|Conflicts)-Arch
 
  -- James McCoy <jamessan at debian.org>  Sat, 17 Jun 2017 21:51:10 -0400
 
diff --git a/debian/patches/series b/debian/patches/series
index 600d04b..499fdf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
 debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
 debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
 debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
diff --git a/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch b/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
new file mode 100644
index 0000000..547712b
--- /dev/null
+++ b/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
@@ -0,0 +1,40 @@
+From: James McCoy <jamessan at debian.org>
+Date: Wed, 5 Jul 2017 21:30:44 -0400
+Subject: debcontrol.vim: Add support for Build-(Depends|Conflicts)-Arch
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index b1bc9f8..67f2b57 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -3,7 +3,7 @@
+ " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
+ " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
+ "                     Wichert Akkerman <wakkerma at debian.org>
+-" Last Change: 2016 Aug 30
++" Last Change: 2017 Jul 05
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
+ 
+ " Standard syntax initialization
+@@ -60,7 +60,7 @@ syn match debcontrolComment "^#.*$" contains=@Spell
+ syn case ignore
+ 
+ " List of all legal keys
+-syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\): *"
++syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\): *"
+ 
+ syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
+ 
+@@ -80,7 +80,7 @@ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" co
+ 
+ " Catch-all for the other legal fields
+ syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
+-syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
++syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
+ syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
+ 
+ " Associate our matches and regions with pretty colours

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git