diff options
| author | Guilhem Moulin <guilhem@debian.org> | 2021-02-15 00:16:13 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@debian.org> | 2021-02-15 01:33:27 +0100 |
| commit | 0d5d2ad2c8612c5a613404c5e3d3eed2381c9b89 (patch) | |
| tree | a5f4d212540e8eca458379ebd1629c384520ffc1 | |
| parent | a2903a145cd7744dcb6d0a1b971fdd575879d3c7 (diff) | |
d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1).
| -rw-r--r-- | debian/.gitattributes | 1 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 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 f88ece2..f04639f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ lacme (0.7-2) UNRELEASED; urgency=medium * d/gbp.conf: Update debian and upstream branches in compliance with DEP-14. * d/control: Point Vcs-* to salsa. * Add debian/salsa-ci.yml file. + * d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs. -- Guilhem Moulin <guilhem@debian.org> Wed, 09 Dec 2020 20:11:40 +0100 |