From c3314dae2d3df82e188daf6ba8520cce833592c6 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 25 Aug 2011 03:36:25 -0600 Subject: [PATCH] use multimaint-merge to make Debian changelogs less ugly --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.30.2