From: Bdale Garbee <bdale@gag.com>
Date: Thu, 25 Aug 2011 09:36:25 +0000 (-0600)
Subject: use multimaint-merge to make Debian changelogs less ugly
X-Git-Tag: 1.0.1~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c3314dae2d3df82e188daf6ba8520cce833592c6;hp=f9d87de0e2681c2ec5753f4fffef0e61a3a9e144

use multimaint-merge to make Debian changelogs less ugly
---

diff --git a/debian/rules b/debian/rules
index 028b548f..9f24321b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; f
 # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
 prebuild:
 	echo $(DEB_VERSION)
-	git-dch --release --new-version=$(DEB_VERSION)
+	git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge
 	git log > ChangeLog
 	git commit -n ChangeLog debian/changelog \
 		-m "update changelogs for Debian build"