build system: allow decreasing debian versions for debian-snapshot

[notmuch.git] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 6ddef5c883b56a5970a9e96cb25f5e417b5f3ae0..d97fa6183d45f179294f29b2cf853cbb5898d5b0 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -17,7 +17,7 @@ ifneq ($(MAKECMDGOALS),release)
 ifneq ($(MAKECMDGOALS),release-message)
 ifneq ($(MAKECMDGOALS),pre-release)
 ifeq ($(IS_GIT),yes)
-VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/-/+/ -e s/-/~/)
+VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
 endif
 endif
 endif
@@ -135,7 +135,7 @@ debian-snapshot: TMPFILE := $(shell mktemp)
 debian-snapshot:
        make VERSION=$(VERSION) clean
        cp debian/changelog $(TMPFILE)
-       EDITOR=/bin/true dch -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
+       EDITOR=/bin/true dch -b -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
        echo '3.0 (native)' > debian/source/format
        debuild -us -uc
        mv -f $(TMPFILE) debian/changelog