Bug#928630: unblock: vim/2:8.1.0875-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package vim
This upload updates the Debian/Ubuntu release names in a couple syntax
highlighting files to include buster, bullseye, and bookworm (for
Debian) and eoan (for Ubuntu).
unblock vim/2:8.1.0875-3
-- System Information:
Debian Release: 10.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diffstat for vim-8.1.0875 vim-8.1.0875
changelog | 7 +++
patches/series | 1
patches/upstream/deb-release-names.patch | 58 +++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+)
diff -Nru vim-8.1.0875/debian/changelog vim-8.1.0875/debian/changelog
--- vim-8.1.0875/debian/changelog 2019-02-22 07:55:04.000000000 -0500
+++ vim-8.1.0875/debian/changelog 2019-05-05 23:41:10.000000000 -0400
@@ -1,3 +1,10 @@
+vim (2:8.1.0875-3) unstable; urgency=medium
+
+ * syntax/deb{changelog,sources}: Update release names for Debian/Ubuntu
+ (Closes: #927167)
+
+ -- James McCoy <jamessan@debian.org> Sun, 05 May 2019 23:41:10 -0400
+
vim (2:8.1.0875-2) unstable; urgency=medium
* Backport 8.1.0878 and 8.1.0884 to fix test failures on kFreeBSD.
diff -Nru vim-8.1.0875/debian/patches/series vim-8.1.0875/debian/patches/series
--- vim-8.1.0875/debian/patches/series 2019-02-22 07:55:04.000000000 -0500
+++ vim-8.1.0875/debian/patches/series 2019-05-05 23:41:10.000000000 -0400
@@ -6,3 +6,4 @@
patch-8.1.0878-test-for-has-bsd-fails-on-some-BSD-systems.patch
patch-8.1.0884-double-check-for-bsd-systems.patch
patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch
+upstream/deb-release-names.patch
diff -Nru vim-8.1.0875/debian/patches/upstream/deb-release-names.patch vim-8.1.0875/debian/patches/upstream/deb-release-names.patch
--- vim-8.1.0875/debian/patches/upstream/deb-release-names.patch 1969-12-31 19:00:00.000000000 -0500
+++ vim-8.1.0875/debian/patches/upstream/deb-release-names.patch 2019-05-05 23:41:10.000000000 -0400
@@ -0,0 +1,58 @@
+From: James McCoy <jamessan@debian.org>
+Date: Sun, 21 Apr 2019 23:12:18 -0400
+Subject: Add Ubuntu's eoan and Debian's buster, bullseye, bookworm releases
+
+Signed-off-by: James McCoy <jamessan@debian.org>
+---
+ runtime/syntax/debchangelog.vim | 4 ++--
+ runtime/syntax/debsources.vim | 7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
+index 4ca4c29..9d6dfe9 100644
+--- a/runtime/syntax/debchangelog.vim
++++ b/runtime/syntax/debchangelog.vim
+@@ -3,7 +3,7 @@
+ " Maintainer: Debian Vim Maintainers
+ " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+ " Wichert Akkerman <wakkerma@debian.org>
+-" Last Change: 2019 Jan 26
++" Last Change: 2019 Apr 21
+ " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/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|bionic|cosmic|disco)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
++syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(squeeze|wheezy|jessie)-%(backports%(-sloppy)=|lts|security)|stretch%(-backports%(-sloppy)=|-security)=|buster%(-backports|-security)=|bullseye|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan)%(-%(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 4b21941..f90476f 100644
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -2,7 +2,7 @@
+ " Language: Debian sources.list
+ " Maintainer: Debian Vim Maintainers
+ " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
+-" Last Change: 2018 Oct 30
++" Last Change: 2019 Apr 21
+ " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
+
+ " Standard syntax initialization
+@@ -23,9 +23,10 @@ let s:cpo = &cpo
+ set cpo-=C
+ let s:supported = [
+ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+- \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
++ \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
++ \ 'sid', 'rc-buggy',
+ \
+- \ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'devel'
++ \ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'eoan', 'devel'
+ \ ]
+ let s:unsupported = [
+ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
Reply to: