summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2011-08-25 03:36:25 -0600
committerBdale Garbee <bdale@gag.com>2011-08-25 03:36:25 -0600
commitc3314dae2d3df82e188daf6ba8520cce833592c6 (patch)
tree69e54f453435e0fadce4d3ed50fbfbc265bb77f1 /debian
parentf9d87de0e2681c2ec5753f4fffef0e61a3a9e144 (diff)
use multimaint-merge to make Debian changelogs less ugly
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules2
1 files changed, 1 insertions, 1 deletions
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"