[vim] 05/05: Refresh debian/patches
James McCoy
jamessan at debian.org
Wed Aug 31 04:00:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit d81ce7f91a9330eb0fa3ac070ad97af00db9416b
Author: James McCoy <jamessan at debian.org>
Date: Tue Aug 30 22:19:05 2016 -0400
Refresh debian/patches
+ Debian runtime updates (Ubuntu releases, mips64el arch)
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 3 +
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 4 +-
...s-decision-to-disable-modelines-by-defaul.patch | 4 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 8 +-
debian/patches/series | 3 +
...te-for-old-Vim-versions-from-Debian-runti.patch | 169 +++++++++++++++++++++
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 4 +-
...ebcontrol.vim-Add-mips64el-as-a-recognize.patch | 23 +++
...tax-debsources.vim-Update-Ubuntu-releases.patch | 33 ++++
9 files changed, 241 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c1f436..ded1f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ vim (2:7.4.2295-1) UNRELEASED; urgency=medium
[ James McCoy ]
* Switch from Python2 to Python3 language bindings. All packaged
addons which use Python support both 2 & 3. (Closes: #729924)
+ * Add mips64el as a recognized architecture in debcontrol files. Thanks to
+ Reiner Herrmann for the patch. (Closes: #830545)
+ * Update supported Ubuntu releases in debsources files.
-- James McCoy <jamessan at debian.org> Tue, 30 Aug 2016 21:28:21 -0400
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index 9eeeef1..779f0cc 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index f96c6ad..3802d79 100644
+index 4fc4275..688fb3a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
-@@ -2212,7 +2212,7 @@ func! s:FTtex()
+@@ -2214,7 +2214,7 @@ func! s:FTtex()
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
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 6316077..476f1ca 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,10 +15,10 @@ 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 16002dd..03b9e70 100644
+index 93e2a88..7907118 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5101,7 +5101,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5120,7 +5120,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
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 ce4a50a..b0fe891 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, 16 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
-index c694532..d518f46 100644
+index acc51f1..50dbff8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1729,6 +1729,10 @@ parse_command_name(mparm_T *parmp)
@@ -46,7 +46,7 @@ index c694532..d518f46 100644
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
diff --git a/src/os_unix.h b/src/os_unix.h
-index 4b3a3f1..36d14fd 100644
+index 1070746..0020c58 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -217,6 +217,9 @@ typedef struct dsc$descriptor DESC;
@@ -60,10 +60,10 @@ index 4b3a3f1..36d14fd 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index b56282f..b8f790f 100644
+index ebeefd0..90760f3 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3231,6 +3231,9 @@ typedef struct
+@@ -3243,6 +3243,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 600d04b..a0f9bf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@ 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/Remove-boilerplate-for-old-Vim-versions-from-Debian-runti.patch
+upstream/runtime-syntax-debcontrol.vim-Add-mips64el-as-a-recognize.patch
+upstream/runtime-syntax-debsources.vim-Update-Ubuntu-releases.patch
diff --git a/debian/patches/upstream/Remove-boilerplate-for-old-Vim-versions-from-Debian-runti.patch b/debian/patches/upstream/Remove-boilerplate-for-old-Vim-versions-from-Debian-runti.patch
new file mode 100644
index 0000000..4bd088d
--- /dev/null
+++ b/debian/patches/upstream/Remove-boilerplate-for-old-Vim-versions-from-Debian-runti.patch
@@ -0,0 +1,169 @@
+From: James McCoy <jamessan at debian.org>
+Date: Tue, 30 Aug 2016 22:11:48 -0400
+Subject: Remove boilerplate for old Vim versions from Debian runtime files
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debchangelog.vim | 39 ++++++++++------------------
+ runtime/syntax/debcontrol.vim | 57 ++++++++++++++++-------------------------
+ runtime/syntax/debsources.vim | 6 ++---
+ 3 files changed, 37 insertions(+), 65 deletions(-)
+
+diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
+index d0c658c..a10e4ad 100644
+--- a/runtime/syntax/debchangelog.vim
++++ b/runtime/syntax/debchangelog.vim
+@@ -3,13 +3,11 @@
+ " 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 Apr 24
++" Last Change: 2016 Aug 30
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
+
+ " Standard syntax initialization
+-if version < 600
+- syntax clear
+-elseif exists("b:current_syntax")
++if exists("b:current_syntax")
+ finish
+ endif
+
+@@ -36,28 +34,17 @@ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail
+ syn region debchangelogEntry start="^ " end="$" contains=debchangelogCloses,debchangelogLP oneline
+
+ " Associate our matches and regions with pretty colours
+-if version >= 508 || !exists("did_debchangelog_syn_inits")
+- if version < 508
+- let did_debchangelog_syn_inits = 1
+- command -nargs=+ HiLink hi link <args>
+- else
+- command -nargs=+ HiLink hi def link <args>
+- endif
+-
+- HiLink debchangelogHeader Error
+- HiLink debchangelogFooter Identifier
+- HiLink debchangelogEntry Normal
+- HiLink debchangelogCloses Statement
+- HiLink debchangelogLP Statement
+- HiLink debchangelogFirstKV Identifier
+- HiLink debchangelogOtherKV Identifier
+- HiLink debchangelogName Comment
+- HiLink debchangelogVersion Identifier
+- HiLink debchangelogTarget Identifier
+- HiLink debchangelogEmail Special
+-
+- delcommand HiLink
+-endif
++hi def link debchangelogHeader Error
++hi def link debchangelogFooter Identifier
++hi def link debchangelogEntry Normal
++hi def link debchangelogCloses Statement
++hi def link debchangelogLP Statement
++hi def link debchangelogFirstKV Identifier
++hi def link debchangelogOtherKV Identifier
++hi def link debchangelogName Comment
++hi def link debchangelogVersion Identifier
++hi def link debchangelogTarget Identifier
++hi def link debchangelogEmail Special
+
+ let b:current_syntax = "debchangelog"
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index 4fb53a5..9729981 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -3,13 +3,11 @@
+ " 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: 2015 Oct 24
++" Last Change: 2016 Aug 30
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
+
+ " Standard syntax initialization
+-if version < 600
+- syntax clear
+-elseif exists("b:current_syntax")
++if exists("b:current_syntax")
+ finish
+ endif
+
+@@ -86,37 +84,26 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde
+ 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
+-if version >= 508 || !exists("did_debcontrol_syn_inits")
+- if version < 508
+- let did_debcontrol_syn_inits = 1
+- command -nargs=+ HiLink hi link <args>
+- else
+- command -nargs=+ HiLink hi def link <args>
+- endif
+-
+- HiLink debcontrolKey Keyword
+- HiLink debcontrolField Normal
+- HiLink debcontrolStrictField Error
+- HiLink debcontrolDeprecatedKey Error
+- HiLink debcontrolMultiField Normal
+- HiLink debcontrolArchitecture Normal
+- HiLink debcontrolMultiArch Normal
+- HiLink debcontrolName Normal
+- HiLink debcontrolPriority Normal
+- HiLink debcontrolSection Normal
+- HiLink debcontrolPackageType Normal
+- HiLink debcontrolVariable Identifier
+- HiLink debcontrolEmail Identifier
+- HiLink debcontrolVcsSvn Identifier
+- HiLink debcontrolVcsCvs Identifier
+- HiLink debcontrolVcsGit Identifier
+- HiLink debcontrolHTTPUrl Identifier
+- HiLink debcontrolDmUpload Identifier
+- HiLink debcontrolComment Comment
+- HiLink debcontrolElse Special
+-
+- delcommand HiLink
+-endif
++hi def link debcontrolKey Keyword
++hi def link debcontrolField Normal
++hi def link debcontrolStrictField Error
++hi def link debcontrolDeprecatedKey Error
++hi def link debcontrolMultiField Normal
++hi def link debcontrolArchitecture Normal
++hi def link debcontrolMultiArch Normal
++hi def link debcontrolName Normal
++hi def link debcontrolPriority Normal
++hi def link debcontrolSection Normal
++hi def link debcontrolPackageType Normal
++hi def link debcontrolVariable Identifier
++hi def link debcontrolEmail Identifier
++hi def link debcontrolVcsSvn Identifier
++hi def link debcontrolVcsCvs Identifier
++hi def link debcontrolVcsGit Identifier
++hi def link debcontrolHTTPUrl Identifier
++hi def link debcontrolDmUpload Identifier
++hi def link debcontrolComment Comment
++hi def link debcontrolElse Special
+
+ let b:current_syntax = "debcontrol"
+
+diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
+index d35e247..885f3b8 100644
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -2,13 +2,11 @@
+ " 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 Apr 24
++" Last Change: 2016 Aug 30
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
+
+ " Standard syntax initialization
+-if version < 600
+- syntax clear
+-elseif exists("b:current_syntax")
++if exists("b:current_syntax")
+ finish
+ endif
+
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 4cb57fa..2d89157 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 9d35e48..86ee967 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.in b/src/configure.in
-index 504aca6..7c09064 100644
+index c0a60b2..53650eb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index 504aca6..7c09064 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 21f6932..5173a7e 100644
+index f0f9c82..b19051b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -43,11 +43,17 @@ make_version(void)
diff --git a/debian/patches/upstream/runtime-syntax-debcontrol.vim-Add-mips64el-as-a-recognize.patch b/debian/patches/upstream/runtime-syntax-debcontrol.vim-Add-mips64el-as-a-recognize.patch
new file mode 100644
index 0000000..d25e3db
--- /dev/null
+++ b/debian/patches/upstream/runtime-syntax-debcontrol.vim-Add-mips64el-as-a-recognize.patch
@@ -0,0 +1,23 @@
+From: James McCoy <jamessan at debian.org>
+Date: Tue, 30 Aug 2016 22:13:45 -0400
+Subject: runtime/syntax/debcontrol.vim: Add mips64el as a recognized arch
+
+Closes: #830545
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index 9729981..b52c496 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -26,7 +26,7 @@ syn match debControlSpace " "
+
+ let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
+ let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
+- \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el'
++ \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el'
+ \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
+ let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
+
diff --git a/debian/patches/upstream/runtime-syntax-debsources.vim-Update-Ubuntu-releases.patch b/debian/patches/upstream/runtime-syntax-debsources.vim-Update-Ubuntu-releases.patch
new file mode 100644
index 0000000..f30d27f
--- /dev/null
+++ b/debian/patches/upstream/runtime-syntax-debsources.vim-Update-Ubuntu-releases.patch
@@ -0,0 +1,33 @@
+From: James McCoy <jamessan at debian.org>
+Date: Tue, 30 Aug 2016 22:15:06 -0400
+Subject: runtime/syntax/debsources.vim: Update Ubuntu releases
+
+Move wily to unsupported.
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debsources.vim | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
+index 885f3b8..232e727 100644
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -25,7 +25,7 @@ let s:supported = [
+ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+ \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
+ \
+- \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel'
++ \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
+ \ ]
+ let s:unsupported = [
+ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+@@ -34,7 +34,7 @@ let s:unsupported = [
+ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+ \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+ \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
+- \ 'utopic', 'vivid'
++ \ 'utopic', 'vivid', 'wily'
+ \ ]
+ let &cpo=s:cpo
+
--
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