aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.gitattributes1
-rw-r--r--debian/changelog1
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