From 0022675aa362da0969666e48ced252b57ca1f79e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 1 Oct 2020 16:54:07 +0200
Subject: patch 8.2.1779: some debian changelog files are not recognized

Problem:    Some debian changelog files are not recognized.
Solution:   Add */debian/changelog. (Jason Franklin)
---
 runtime/filetype.vim          | 2 +-
 src/testdir/test_filetype.vim | 1 +
 src/version.c                 | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ba1b79508c..2b134c22b6 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -317,7 +317,7 @@ au BufNewFile,BufRead *.css			setf css
 au BufNewFile,BufRead *.con			setf cterm
 
 " Changelog
-au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
+au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
 					\	setf debchangelog
 
 au BufNewFile,BufRead [cC]hange[lL]og
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8e41b1e43b..d871b49c3b 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -128,6 +128,7 @@ let s:filename_checks = {
     \ 'dart': ['file.dart', 'file.drt'],
     \ 'datascript': ['file.ds'],
     \ 'dcd': ['file.dcd'],
+    \ 'debchangelog': ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'],
     \ 'debcontrol': ['/debian/control'],
     \ 'debsources': ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list'],
     \ 'def': ['file.def'],
diff --git a/src/version.c b/src/version.c
index b92e99be54..39dcf2ef21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1779,
 /**/
     1778,
 /**/
-- 
cgit v1.2.3