diff options
| author | Guilhem Moulin <guilhem@debian.org> | 2020-12-26 23:44:35 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2020-12-27 00:10:50 +0100 |
| commit | 1c488abae8259741db2d10659cd3d6f607425216 (patch) | |
| tree | af7dcc2a6cf30c9a7d2f91d4bdba901def4481c1 | |
| parent | 2c7472985716ddbf38c60dc6ba09efdf9b1ef027 (diff) | |
d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1).
| -rw-r--r-- | debian/.gitattributes | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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 |