[vim] 02/04: Update releases in deb{changelog, sources} syntax files
James McCoy
jamessan at debian.org
Sun Apr 23 16:40:09 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 b40918177006aa93385e3dfa7a6746c89c812e93
Author: James McCoy <jamessan at debian.org>
Date: Sat Apr 22 22:10:14 2017 -0400
Update releases in deb{changelog,sources} syntax files
Require word boundary around distribution name.
Closes: #859247
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 4 +
debian/patches/series | 1 +
...ses-in-deb-changelog-sources-syntax-files.patch | 92 ++++++++++++++++++++++
3 files changed, 97 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 587486f..7498065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ vim (2:8.0.0197-4) UNRELEASED; urgency=medium
* Backport upstream patch v8.0.0550 to fix a regression in tag lookups for
ctags-generated emacs style tags files. (Closes: #859426)
+ * Add Artful Aardvark, jessie-backports-sloppy, and
+ stretch-backports/security to deb{changelog,sources} syntax files.
+ * debsources.vim: Require word boundaries around distribution name.
+ (Closes: #859247)
-- James McCoy <jamessan at debian.org> Sat, 22 Apr 2017 13:45:28 -0400
diff --git a/debian/patches/series b/debian/patches/series
index e731cf7..ce944e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ upstream/patch-8.0.0322-possible-overflow-with-corrupted-spell-fil.patch
upstream/patch-8.0.0377-possible-overflow-when-reading-corrupted-u.patch
upstream/patch-8.0.0378-possible-overflow-when-reading-corrupted-u.patch
upstream/patch-8.0.0550-cannot-parse-some-etags-format-tags-file.patch
+upstream/Update-releases-in-deb-changelog-sources-syntax-files.patch
diff --git a/debian/patches/upstream/Update-releases-in-deb-changelog-sources-syntax-files.patch b/debian/patches/upstream/Update-releases-in-deb-changelog-sources-syntax-files.patch
new file mode 100644
index 0000000..4427075
--- /dev/null
+++ b/debian/patches/upstream/Update-releases-in-deb-changelog-sources-syntax-files.patch
@@ -0,0 +1,92 @@
+From: James McCoy <jamessan at debian.org>
+Date: Sun, 23 Apr 2017 12:10:19 -0400
+Subject: Update releases in deb{changelog,sources} syntax files
+
+- Add artful (Aardvark) to both
+- Add jessie-backports-sloppy, stretch-backports, and stretch-security
+ to debchangelog
+- debchangelog: Make urgency/binNMU variables script-local to avoid
+ namespace pollution
+- debsource: Require word boundary around distribution name.
+
+Closes: #859247
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debchangelog.vim | 12 ++++++------
+ runtime/syntax/debsources.vim | 10 +++++-----
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
+index eb02aaf..6e6ed19 100644
+--- a/runtime/syntax/debchangelog.vim
++++ b/runtime/syntax/debchangelog.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 Nov 12
++" Last Change: 2017 Apr 23
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
+
+ " Standard syntax initialization
+@@ -14,14 +14,14 @@ endif
+ " Case doesn't matter for us
+ syn case ignore
+
+-let urgency='urgency=\(low\|medium\|high\|critical\)\( [^[:space:],][^,]*\)\='
+-let binNMU='binary-only=yes'
++let s:urgency='urgency=\(low\|medium\|high\|critical\)\( [^[:space:],][^,]*\)\='
++let s:binNMU='binary-only=yes'
+
+ " Define some common expressions we can use later on
+ syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ "
+-exe 'syn match debchangelogFirstKV contained "; \('.urgency.'\|'.binNMU.'\)"'
+-exe 'syn match debchangelogOtherKV contained ", \('.urgency.'\|'.binNMU.'\)"'
+-syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
++exe 'syn match debchangelogFirstKV contained "; \('.s:urgency.'\|'.s:binNMU.'\)"'
++exe 'syn match debchangelogOtherKV contained ", \('.s:urgency.'\|'.s:binNMU.'\)"'
++syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|%(wheezy|jessie)%(-backports%(-sloppy)=|-security)=|stretch%(-backports|-security)=|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful)%(-%(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\+\)*"
+diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
+index 390c430..4fa80de 100644
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -2,7 +2,7 @@
+ " Language: Debian sources.list
+ " Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
+ " Former Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
+-" Last Change: 2016 Nov 12
++" Last Change: 2017 Apr 22
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
+
+ " Standard syntax initialization
+@@ -25,7 +25,7 @@ let s:supported = [
+ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+ \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
+ \
+- \ 'precise', 'trusty', 'xenial', 'yakkety', 'zesty', 'devel'
++ \ 'trusty', 'xenial', 'yakkety', 'zesty', 'artful', 'devel'
+ \ ]
+ let s:unsupported = [
+ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+@@ -33,15 +33,15 @@ let s:unsupported = [
+ \
+ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+ \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+- \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
++ \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
+ \ 'utopic', 'vivid', 'wily'
+ \ ]
+ let &cpo=s:cpo
+
+ " Match uri's
+ syn match debsourcesUri +\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++
+-exe 'syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\('. join(s:supported, '\|'). '\)\([-[:alnum:]_./]*\)+'
+-exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\('. join(s:unsupported, '\|') .'\)\([-[:alnum:]_./]*\)+'
++exe 'syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(s:supported, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
++exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(s:unsupported, '\|') .'\)\>\([-[:alnum:]_./]*\)+'
+
+ " Associate our matches and regions with pretty colours
+ hi def link debsourcesLine Error
--
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