[vim] 02/05: Refresh debian/patches
James McCoy
jamessan at debian.org
Tue Sep 6 03:20:12 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 57c21527dfb2d21ec6f256cba5e96be734fed28e
Author: James McCoy <jamessan at debian.org>
Date: Sun Sep 4 18:49:32 2016 -0400
Refresh debian/patches
- Debian runtime updates, applied upstream
Signed-off-by: James McCoy <jamessan at debian.org>
---
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 2 +-
debian/patches/series | 3 -
...te-for-old-Vim-versions-from-Debian-runti.patch | 169 ---------------------
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 2 +-
...ebcontrol.vim-Add-mips64el-as-a-recognize.patch | 23 ---
...tax-debsources.vim-Update-Ubuntu-releases.patch | 33 ----
6 files changed, 2 insertions(+), 230 deletions(-)
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 b0fe891..4fd3b0a 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
@@ -60,7 +60,7 @@ index 1070746..0020c58 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index ebeefd0..90760f3 100644
+index a44bcec..7598649 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -3243,6 +3243,9 @@ typedef struct
diff --git a/debian/patches/series b/debian/patches/series
index a0f9bf0..600d04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,3 @@ 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
deleted file mode 100644
index 4bd088d..0000000
--- a/debian/patches/upstream/Remove-boilerplate-for-old-Vim-versions-from-Debian-runti.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-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 2d89157..4a8985b 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 c0a60b2..53650eb 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index f0f9c82..b19051b 100644
+index 42eeaa8..8c1642c 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
deleted file mode 100644
index d25e3db..0000000
--- a/debian/patches/upstream/runtime-syntax-debcontrol.vim-Add-mips64el-as-a-recognize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index f30d27f..0000000
--- a/debian/patches/upstream/runtime-syntax-debsources.vim-Update-Ubuntu-releases.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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