Commit: patch 9.1.0886: filetype: debian control file not detected

[Christian Brabandt]

patch 9.1.0886: filetype: debian control file not detected

Commit: https://github.com/vim/vim/commit/57b947e3c3b8d52b914158979263855d785445d5
Author: Wu, Zhenyu <wuzh...@ustc.edu>
Date: Sun Nov 24 14:34:01 2024 +0100

patch 9.1.0886: filetype: debian control file not detected

Problem: filetype: debian control file not detected
Solution: detect 'debian/control' files as debcontrol filetype
(author)

closes: #16067

Signed-off-by: Wu, Zhenyu <wuzh...@ustc.edu>
Signed-off-by: James McCoy <jame...@debian.org>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ef8c0e922..08290d0b8 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2024 Nov 19
+" Last Change: 2024 Nov 24
" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Listen very carefully, I will say this only once
@@ -646,9 +646,9 @@ au BufNewFile,BufRead *.dfy setf dafny
au BufRead,BufNewfile *.dart,*.drt setf dart

" Debian Control
-au BufNewFile,BufRead */debian/control setf debcontrol
+au BufNewFile,BufRead */{debian,DEBIAN}/control setf debcontrol
au BufNewFile,BufRead control
- \ if getline(1) =~ '^Source:'
+ \ if getline(1) =~ '^Source:\|^Package:'
\| setf debcontrol
\| endif

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 001a970ae..4a905a889 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -211,7 +211,7 @@ def s:GetFilenameChecks(): dict<list<string>>
datascript: ['file.ds'],
dcd: ['file.dcd'],
debchangelog: ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'],
- debcontrol: ['/debian/control', 'any/debian/control'],
+ debcontrol: ['/debian/control', 'any/debian/control', 'any/DEBIAN/control'],
debcopyright: ['/debian/copyright', 'any/debian/copyright'],
debsources: ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list', 'any/etc/apt/sources.list', 'any/etc/apt/sources.list.d/file.list'],
deb822sources: ['/etc/apt/sources.list.d/file.sources', 'any/etc/apt/sources.list.d/file.sources'],
diff --git a/src/version.c b/src/version.c
index b56980772..6f5c7a498 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 886,
/**/
885,
/**/