diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:11:10 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:11:10 +0000 |
| commit | 8de0b1a90d5b552dae1d5db063f1a512e4873dc5 (patch) | |
| tree | 6c03cf1d8e21de9aab1bd9c6180a15eda19b9137 | |
| parent | Merging upstream version 2:9.1.0374. (diff) | |
| download | vim-8de0b1a90d5b552dae1d5db063f1a512e4873dc5.tar.xz vim-8de0b1a90d5b552dae1d5db063f1a512e4873dc5.zip | |
Merging debian version 2:9.1.0374-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/ubuntu-oracular.patch | 18 |
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 19c3647..b7f9c19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vim (2:9.1.0374-1) unstable; urgency=medium + + * Team upload. + * New upstream tag v9.1.0374. + * runtime(debversions): Add oracular (24.10) as Ubuntu release name. + + -- Simon Quigley <tsimonq2@debian.org> Fri, 26 Apr 2024 16:34:19 -0500 + vim (2:9.1.0199-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/patches/series b/debian/patches/series index dadfd69..10b81df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ 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 +ubuntu-oracular.patch progress-linux/0001-syntax-debversions.patch progress-linux/0002-disable-mouse.patch progress-linux/0003-disable-BufReadPost.patch diff --git a/debian/patches/ubuntu-oracular.patch b/debian/patches/ubuntu-oracular.patch new file mode 100644 index 0000000..3bef56b --- /dev/null +++ b/debian/patches/ubuntu-oracular.patch @@ -0,0 +1,18 @@ +Description: runtime(debversions): Add oracular (24.10) as Ubuntu release name +Author: Simon Quigley <tsimonq2@ubuntu.com> +Origin: vendor +Forwarded: https://github.com/vim/vim/pull/14645 +Last-Update: 2024-04-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/runtime/syntax/shared/debversions.vim ++++ b/runtime/syntax/shared/debversions.vim +@@ -11,7 +11,7 @@ let g:debSharedSupportedVersions = [ + \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy', + \ 'bullseye', 'bookworm', 'trixie', 'forky', + \ +- \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'mantic', 'noble', ++ \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'mantic', 'noble', 'oracular', + \ 'devel' + \ ] + let g:debSharedUnsupportedVersions = [ |