From 1c488abae8259741db2d10659cd3d6f607425216 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:44:35 +0100 Subject: d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1). --- debian/.gitattributes | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 debian/.gitattributes (limited to 'debian') diff --git a/debian/.gitattributes b/debian/.gitattributes new file mode 100644 index 0000000..592f8c4 --- /dev/null +++ b/debian/.gitattributes @@ -0,0 +1 @@ +/changelog merge=dpkg-mergechangelogs diff --git a/debian/changelog b/debian/changelog index c333a18..023857f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ interimap (0.5.5-1) UNRELEASED; urgency=medium no promise of API stability. * d/control: Bump dovecot-imapd version to >=2.3 in Build-Depends for the test suite. + * d/.gitattributes: New file to merge d/changelog with + dpkg-mergechangelogs(1). -- Guilhem Moulin Sat, 26 Dec 2020 23:33:39 +0100 -- cgit v1.2.3