X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=debian%2Frules;h=122a0fed2349bfcc7cbe9895e8fe9b095c730888;hp=028b548f31990072a505fc75f3818cd60abd8ccd;hb=cdb32b1717db4e8cb8cf94d810e74ce2b569566b;hpb=fc7e46b1215ea2b4cc138ed77d8eaa122369b15f

diff --git a/debian/rules b/debian/rules
index 028b548f..122a0fed 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"
@@ -27,7 +27,7 @@ build-indep: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
-	$(MAKE) VERSION=$(PKG_VERSION)
+	$(MAKE)
 	(cd doc ; $(MAKE))
 	touch $@