[vim] 01/01: syntax/debsources.vim: Fix syntax error in s:unsupported

James McCoy jamessan at debian.org
Sun Oct 29 03:10:47 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 e80db14ec1608a12f97589cf6e43b7edaa69349e
Author: James McCoy <jamessan at debian.org>
Date:   Sat Oct 28 23:09:59 2017 -0400

    syntax/debsources.vim: Fix syntax error in s:unsupported
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                                  | 8 ++++++++
 .../Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch  | 2 +-
 .../syntax-deb-source-changelog-.vim-Update-release-names.patch   | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db1c87e..48a9d62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vim (2:8.0.1226-2) UNRELEASED; urgency=medium
+
+  * syntax/debsources.vim:
+    + Fix syntax error in definition of unsupported releases.  Thanks to Josh
+      Triplett.  (Closes: #879986)
+
+ -- James McCoy <jamessan at debian.org>  Sat, 28 Oct 2017 23:08:26 -0400
+
 vim (2:8.0.1226-1) unstable; urgency=medium
 
   [ upstream ]
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 33949df..5cebdcf 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 f465096..0eae4c0 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index 6ab4e75..923e830 100644
+index 71569b3..a0fb0f3 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
index 6a99f12..d9c5804 100644
--- 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
@@ -1,5 +1,5 @@
 From: James McCoy <jamessan at debian.org>
-Date: Thu, 26 Oct 2017 23:00:48 -0400
+Date: Sat, 28 Oct 2017 23:07:40 -0400
 Subject: syntax/deb{source,changelog}.vim: Update release names
 
 Add new bionic release for Ubuntu.
@@ -34,7 +34,7 @@ index 6e6ed19..0d3f872 100644
  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
+index 4fa80de..6791ece 100644
 --- a/runtime/syntax/debsources.vim
 +++ b/runtime/syntax/debsources.vim
 @@ -2,7 +2,7 @@
@@ -42,7 +42,7 @@ index 4fa80de..3ce2287 100644
  " 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
++" Last Change: 2017 Oct 28
  " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
  
  " Standard syntax initialization
@@ -59,7 +59,7 @@ index 4fa80de..3ce2287 100644
  let s:unsupported = [
        \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
 -      \ 'woody', 'sarge', 'etch', 'lenny',
-+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze'
++      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
        \
        \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
        \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',

-- 
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