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

diff --git a/debian/rules b/debian/rules
index 1353321d..122a0fed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,11 @@ 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"
-	git tag debian/$(DEB_VERSION)
+#	git tag debian/$(DEB_VERSION)
 #	git push --tags origin master
 
 configure: configure-stamp
@@ -27,7 +27,7 @@ build-indep: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
-	$(MAKE) VERSION=$(PKG_VERSION)
+	$(MAKE)
 	(cd doc ; $(MAKE))
 	touch $@