[vim] 03/03: Debian related runtime updates
James McCoy
jamessan at debian.org
Fri Oct 27 03:08:20 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 958ef2eb633e954c10261f7fb61c493a22b8254e
Author: James McCoy <jamessan at debian.org>
Date: Thu Oct 26 23:05:59 2017 -0400
Debian related runtime updates
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 6 ++
...s-decision-to-disable-modelines-by-defaul.patch | 2 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 8 +-
debian/patches/series | 2 +
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 4 +-
...ource-changelog-.vim-Update-release-names.patch | 71 +++++++++++++++++
...ontrol.vim-Sync-up-with-deb-src-control-5.patch | 91 ++++++++++++++++++++++
7 files changed, 177 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e16c09a..9c5e5c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ vim (2:8.0.1225-1) UNRELEASED; urgency=medium
[ upstream ]
* 8.0.1154: Fix indentation when 'indentkeys' is in use. (Closes: #877262)
+ [ James McCoy ]
+ * syntax/debcontrol.vim:
+ + Add support for all fields in deb-src-control(5). (Closes: #878970)
+ * syntax/deb{sources,changelog}.vim:
+ + Add bionic release and mark yakkety & squeeze unsupported.
+
-- James McCoy <jamessan at debian.org> Thu, 26 Oct 2017 19:29:12 -0400
vim (2:8.0.1144-1) unstable; urgency=medium
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index f482e4f..2ad41dc 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,7 +15,7 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index b5e5847..eb32f07 100644
+index ebe9c92..af5368b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5256,7 +5256,7 @@ A jump table for the options with a short description can be found at |Q_op|.
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 daf9450..2aea7a0 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,10 +17,10 @@ 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 5233db5..4140d43 100644
+index 0283231..a8ffa9d 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -1777,6 +1777,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1778,6 +1778,10 @@ parse_command_name(mparm_T *parmp)
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
@@ -31,7 +31,7 @@ index 5233db5..4140d43 100644
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
-@@ -3012,7 +3016,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3028,7 +3032,12 @@ source_startup_scripts(mparm_T *parmp)
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
@@ -45,7 +45,7 @@ index 5233db5..4140d43 100644
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3047,6 +3056,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3063,6 +3072,9 @@ source_startup_scripts(mparm_T *parmp)
&& do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL
#ifdef USR_EXRC_FILE2
&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
diff --git a/debian/patches/series b/debian/patches/series
index 600d04b..43cc665 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ 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/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
+upstream/syntax-deb-source-changelog-.vim-Update-release-names.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 924db1e..33949df 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
@@ -37,7 +37,7 @@ index fe68d49..7e6e504 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index 1183ab4..a55753a 100644
+index f465096..0eae4c0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index 1183ab4..a55753a 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 5509b92..227490e 100644
+index 6ab4e75..923e830 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
new file mode 100644
index 0000000..6a99f12
--- /dev/null
+++ b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
@@ -0,0 +1,71 @@
+From: James McCoy <jamessan at debian.org>
+Date: Thu, 26 Oct 2017 23:00:48 -0400
+Subject: syntax/deb{source,changelog}.vim: Update release names
+
+Add new bionic release for Ubuntu.
+Move yakkety and squeeze to unsupported.
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debchangelog.vim | 4 ++--
+ runtime/syntax/debsources.vim | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
+index 6e6ed19..0d3f872 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: 2017 Apr 23
++" Last Change: 2017 Oct 26
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
+
+ " Standard syntax initialization
+@@ -21,7 +21,7 @@ let s:binNMU='binary-only=yes'
+ syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ "
+ 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 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|bionic)%(-%(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 4fa80de..3ce2287 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: 2017 Apr 22
++" Last Change: 2017 Oct 26
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
+
+ " Standard syntax initialization
+@@ -23,18 +23,18 @@ let s:cpo = &cpo
+ set cpo-=C
+ let s:supported = [
+ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+- \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
++ \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
+ \
+- \ 'trusty', 'xenial', 'yakkety', 'zesty', 'artful', 'devel'
++ \ 'trusty', 'xenial', 'zesty', 'artful', 'bionic', 'devel'
+ \ ]
+ let s:unsupported = [
+ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+- \ 'woody', 'sarge', 'etch', 'lenny',
++ \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze'
+ \
+ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+ \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+ \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
+- \ 'utopic', 'vivid', 'wily'
++ \ 'utopic', 'vivid', 'wily', 'yakkety'
+ \ ]
+ let &cpo=s:cpo
+
diff --git a/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch b/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
new file mode 100644
index 0000000..a70f49c
--- /dev/null
+++ b/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
@@ -0,0 +1,91 @@
+From: James McCoy <jamessan at debian.org>
+Date: Thu, 26 Oct 2017 22:50:21 -0400
+Subject: syntax/debcontrol.vim: Sync up with deb-src-control(5)
+
+Added Rules-Requires-Root, Build-Essential, Build-Profiles, Tag,
+Subarchitecture, Kernel-Version, Installer-Menu-Item, Built-Using, and
+general handling for user-defined fields.
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 31 +++++++++++++++++++++++++------
+ 1 file changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index 1131c9e..1b5d37d 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 Aug 18
++" Last Change: 2017 Oct 26
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
+
+ " Standard syntax initialization
+@@ -42,6 +42,8 @@ syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/c
+ syn match debcontrolPackageType contained "u\?deb"
+ syn match debcontrolVariable contained "\${.\{-}}"
+ syn match debcontrolDmUpload contained "\cyes"
++syn match debcontrolYesNo contained "\%(yes\|no\)"
++syn match debcontrolR3 contained "\<\%(no\|binary-targets\|[[:graph:]]\+/[[:graph:]]\+\%( \+[[:graph:]]\+/[[:graph:]]\+\)*\)\>"
+
+ " A URL (using the domain name definitions from RFC 1034 and 1738), right now
+ " only enforce protocol and some sanity on the server/path part;
+@@ -59,15 +61,28 @@ 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\|\%(XS-\)\=Testsuite\): *"
++" List of all legal keys, in order, from deb-src-control(5)
++" Source fields
++syn match debcontrolKey contained "^\%(Source\|Maintainer\|Uploaders\|Standards-Version\|Description\|Homepage\|Bugs\|Rules-Requires-Root\): *"
++syn match debcontrolKey contained "^\%(XS-\)\=Vcs-\%(Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\|Browser\): *"
++syn match debcontrolKey contained "^\%(Origin\|Section\|Priority\): *"
++syn match debcontrolKey contained "^Build-\%(Depends\|Conflicts\)\%(-Arch\|-Indep\)\=: *"
++
++" Binary fields
++syn match debcontrolKey contained "^\%(Package\%(-Type\)\=\|Architecture\|Build-Profiles\): *"
++syn match debcontrolKey contained "^\%(\%(Build-\)\=Essential\|Multi-Arch\|Tag\): *"
++syn match debcontrolKey contained "^\%(\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\): *"
++syn match debcontrolKey contained "^\%(Subarchitecture\|Kernel-Version\|Installer-Menu-Item\): *"
++
++" User-defined fields
++syn match debcontrolKey contained "^X[SBC]\{0,3\}\%(-Private\)\=-[-a-zA-Z0-9]\+: *"
+
+ syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
+
+ " Fields for which we do strict syntax checking
+ syn region debcontrolStrictField start="^Architecture" end="$" contains=debcontrolKey,debcontrolArchitecture,debcontrolSpace oneline
+ syn region debcontrolStrictField start="^Multi-Arch" end="$" contains=debcontrolKey,debcontrolMultiArch oneline
+-syn region debcontrolStrictField start="^\(Package\|Source\)" end="$" contains=debcontrolKey,debcontrolName oneline
++syn region debcontrolStrictField start="^\%(Package\|Source\)" end="$" contains=debcontrolKey,debcontrolName oneline
+ syn region debcontrolStrictField start="^Priority" end="$" contains=debcontrolKey,debcontrolPriority oneline
+ syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
+ syn region debcontrolStrictField start="^\%(XC-\)\=Package-Type" end="$" contains=debcontrolKey,debcontrolPackageType oneline
+@@ -77,10 +92,12 @@ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Svn" end="$" contains=deb
+ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Cvs" end="$" contains=debcontrolKey,debcontrolVcsCvs oneline keepend
+ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Git" end="$" contains=debcontrolKey,debcontrolVcsGit oneline keepend
+ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" contains=debcontrolDeprecatedKey,debcontrolDmUpload oneline
++syn region debcontrolStrictField start="^Rules-Requires-Root" end="$" contains=debcontrolKey,debcontrolR3 oneline
++syn region debcontrolStrictField start="^\%(Build-\)\=Essential" end="$" contains=debcontrolKey,debcontrolYesNo 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\|\%(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 debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\|Build-Profiles\|Tag\|Subarchitecture\|Kernel-Version\|Installer-Menu-Item\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
++syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\|Uploaders\|X[SBC]\{0,3\}\%(Private-\)\=-[-a-zA-Z0-9]\+\):" 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
+@@ -102,6 +119,8 @@ hi def link debcontrolVcsCvs Identifier
+ hi def link debcontrolVcsGit Identifier
+ hi def link debcontrolHTTPUrl Identifier
+ hi def link debcontrolDmUpload Identifier
++hi def link debcontrolYesNo Identifier
++hi def link debcontrolR3 Identifier
+ hi def link debcontrolComment Comment
+ hi def link debcontrolElse Special
+
--
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