[vim] 05/05: Bump version to 2:8.0.0646-1

James McCoy jamessan at debian.org
Sun Jun 18 19:01:33 UTC 2017 

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

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

commit dd507aa7cf1276b88975b5c86ed46272dd9d5913
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 17 22:09:23 2017 -0400

    Bump version to 2:8.0.0646-1
    
    Drop Debian syntax patch, merged upstream.
---
 debian/changelog                                   |  4 +-
 ...of-more-LaTeX-commands-for-tex-filetype-d.patch |  4 +-
 ...t-filetype-using-the-contents-of-the-file.patch |  8 +-
 ...s-decision-to-disable-modelines-by-defaul.patch |  4 +-
 ...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 12 +--
 debian/patches/series                              |  1 -
 ...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch |  6 +-
 ...ses-in-deb-changelog-sources-syntax-files.patch | 92 ----------------------
 8 files changed, 19 insertions(+), 112 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 661ff6e..488d13c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vim (2:8.0.0606-1) UNRELEASED; urgency=medium
+vim (2:8.0.0646-1) UNRELEASED; urgency=medium
 
   [ upstream ]
   * 8.0.0210 et.al.: Add support for bracketed paste.  (Closes: #504244)
@@ -10,7 +10,7 @@ vim (2:8.0.0606-1) UNRELEASED; urgency=medium
     + Specify the "addon", not "name", field is used to declare the addon.
       Thanks to Reiner Herrmann.
 
- -- James McCoy <jamessan at debian.org>  Mon, 29 May 2017 14:20:09 -0400
+ -- James McCoy <jamessan at debian.org>  Sat, 17 Jun 2017 21:51:10 -0400
 
 vim (2:8.0.0197-4) unstable; urgency=medium
 
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 ab40bfc..2a2c18d 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 8758dd2..3adb39c 100644
+index 635e1c3..a2d849f 100644
 --- a/runtime/filetype.vim
 +++ b/runtime/filetype.vim
-@@ -2244,7 +2244,7 @@ func! s:FTtex()
+@@ -2265,7 +2265,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/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index 5a33276..92b091e 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,11 +8,11 @@ Closes: #382541
  1 file changed, 8 insertions(+)
 
 diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index c81253f..7464af1 100644
+index 358d328..092889f 100644
 --- a/runtime/scripts.vim
 +++ b/runtime/scripts.vim
-@@ -344,6 +344,14 @@ else
-   elseif s:line1 =~ 'exec\s\+\S*scheme' || s:line2 =~ 'exec\s\+\S*scheme'
+@@ -348,6 +348,14 @@ else
+   elseif s:line1 =~# 'exec\s\+\S*scheme' || s:line2 =~# 'exec\s\+\S*scheme'
      set ft=scheme
  
 +  " rst files
@@ -24,5 +24,5 @@ index c81253f..7464af1 100644
 +    set ft=rst
 +
    " Git output
-   elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
+   elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
      set ft=git
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 9659a29..baac4ec 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 c6fc424..ec7dea8 100644
+index b310b9f..5baa9d9 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5210,7 +5210,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5222,7 +5222,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 127e63e..398c761 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 883c9cc..d62e1c9 100644
+index e30701c..249314a 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1750,6 +1750,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1763,6 +1763,10 @@ parse_command_name(mparm_T *parmp)
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -31,7 +31,7 @@ index 883c9cc..d62e1c9 100644
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
-@@ -2993,7 +2997,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3006,7 +3010,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 883c9cc..d62e1c9 100644
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3029,6 +3038,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3042,6 +3051,9 @@ source_startup_scripts(mparm_T *parmp)
  #ifdef USR_EXRC_FILE2
  		&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
  #endif
@@ -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 0175017..532f3bd 100644
+index d79b225..36f4006 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -3295,6 +3295,9 @@ typedef struct
+@@ -3297,6 +3297,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 6c473bf..600d04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +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/Update-releases-in-deb-changelog-sources-syntax-files.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 3f7dbb0..0d3ab9a 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
@@ -23,7 +23,7 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
  3 files changed, 19 insertions(+)
 
 diff --git a/src/config.h.in b/src/config.h.in
-index f8a23ed..80ae70c 100644
+index a934507..95b2eab 100644
 --- a/src/config.h.in
 +++ b/src/config.h.in
 @@ -30,6 +30,9 @@
@@ -37,7 +37,7 @@ index f8a23ed..80ae70c 100644
  #undef HAVE_ATTRIBUTE_UNUSED
  
 diff --git a/src/configure.ac b/src/configure.ac
-index d424550..9e9e879 100644
+index 1c1b1c7..db5a45e 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 d424550..9e9e879 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index 0daa349..08a812b 100644
+index 4683ba4..0be0af3 100644
 --- a/src/version.c
 +++ b/src/version.c
 @@ -44,11 +44,17 @@ make_version(void)
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
deleted file mode 100644
index 4427075..0000000
--- a/debian/patches/upstream/Update-releases-in-deb-changelog-sources-syntax-files.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-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