[vim] 01/01: debcontrol.vim: Testsuite field and improved whitespace handling

James McCoy jamessan at debian.org
Sat Aug 19 03:40:59 UTC 2017


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

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

commit bd7d6dff920895d2d13b8da1db800813ffe8d3ce
Author: James McCoy <jamessan at debian.org>
Date:   Fri Aug 18 21:45:17 2017 -0400

    debcontrol.vim: Testsuite field and improved whitespace handling
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                   |  8 ++++
 ...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch |  6 +--
 debian/patches/series                              |  2 +
 ...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch |  2 +-
 ...ntrol.vim-Add-support-for-Testsuite-field.patch | 31 +++++++++++++++
 ...ontrol.vim-Treat-tabs-as-valid-whitespace.patch | 44 ++++++++++++++++++++++
 6 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1782766..06b9f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vim (2:8.0.0946-2) UNRELEASED; urgency=medium
+
+  * debcontrol.vim:
+    + Recognize Testsuite field  (Closes: #872360)
+    + Treat tabs as valid whitespace  (Closes: #872557)
+
+ -- James McCoy <jamessan at debian.org>  Fri, 18 Aug 2017 21:43:18 -0400
+
 vim (2:8.0.0946-1) unstable; urgency=medium
 
   [ upstream ]
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index a5246e7..636d527 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,7 +17,7 @@ Signed-off-by: James Vega <jamessan at debian.org>
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/src/main.c b/src/main.c
-index 4b787a3..a0331f4 100644
+index c6b103e..b14dccd 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -1790,6 +1790,10 @@ parse_command_name(mparm_T *parmp)
@@ -70,10 +70,10 @@ index 695affa..b6e7e59 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 91326f6..b43439d 100644
+index 40dfd95..30017c2 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -3342,6 +3342,9 @@ typedef struct
+@@ -3350,6 +3350,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index 6881e1d..45e6b27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@ 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
 upstream/debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch
+upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
+upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 625f952..2a8c816 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -58,7 +58,7 @@ index ea4df8f..da97804 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index 3833f58..283c108 100644
+index f3e5a3a..977942e 100644
 --- a/src/version.c
 +++ b/src/version.c
 @@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch b/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
new file mode 100644
index 0000000..68d14c9
--- /dev/null
+++ b/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
@@ -0,0 +1,31 @@
+From: James McCoy <jamessan at debian.org>
+Date: Fri, 18 Aug 2017 20:59:12 -0400
+Subject: debcontrol.vim: Add support for Testsuite field
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index afb68c9..1131c9e 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -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\)\%(-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 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\|\%(XS-\)\=Testsuite\): *"
+ 
+ syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
+ 
+@@ -79,7 +79,7 @@ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Git" end="$" contains=deb
+ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" contains=debcontrolDeprecatedKey,debcontrolDmUpload oneline
+ 
+ " 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 debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
+ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
+ syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
+ 
diff --git a/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch b/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
new file mode 100644
index 0000000..31b72e1
--- /dev/null
+++ b/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
@@ -0,0 +1,44 @@
+From: James McCoy <jamessan at debian.org>
+Date: Fri, 18 Aug 2017 20:45:23 -0400
+Subject: debcontrol.vim: Treat tabs as valid whitespace
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index b50bfff..afb68c9 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: 2017 Jul 05
++" Last Change: 2017 Aug 18
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
+ 
+ " Standard syntax initialization
+@@ -21,8 +21,8 @@ syn case match
+ syn match debcontrolElse "^.*$"
+ 
+ " Common seperators
+-syn match debControlComma ", *"
+-syn match debControlSpace " "
++syn match debControlComma ",[ \t]*"
++syn match debControlSpace "[ \t]"
+ 
+ let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
+ let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
+@@ -80,8 +80,8 @@ 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\)\%(-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
++syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
++syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
+ 
+ " Associate our matches and regions with pretty colours
+ hi def link debcontrolKey           Keyword

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



More information about the pkg-vim-maintainers mailing list