aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/.gitattributes1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
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 <guilhem@debian.org> Sat, 26 Dec 2020 23:33:39 +0100