From: David Woodhouse <dwmw@amazon.co.uk>
Date: Sun, 6 May 2018 09:08:20 +0000 (+0100)
Subject: Fix .deb changelog generation for tagged versions
X-Git-Tag: v1.0~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=611cd872e0b2a85cd6c7058f83bb320bf11fcad8;p=pidgin-chime.git

Fix .deb changelog generation for tagged versions
---

diff --git a/Makefile.am b/Makefile.am
index 7bd12a9..105f81e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,8 +83,8 @@ EXTRA_DIST = LICENSE README pidgin-chime.spec pidgin-chime.spec.in $(certs_DATA)
 deb-%: debian/changelog
 	fakeroot debian/rules $(patsubst deb-%,%,$@)
 
-debian/changelog: debian/changelog.in
-	@COMMITDESC=$$(git describe --tags | sed 's/v\(.*\)-g[0-9a-f]\+/\1/'); \
+debian/changelog: debian/changelog.in configure.ac Makefile.am
+	@COMMITDESC=$$(git describe --tags | sed  -e 's/$$/-0/' -e 's/v\([^-]\+-[^-]\+\)\(-g[0-9a-f-]\+\|\)/\1/') \
 	 COMMITDATE=$$(git show -s --format=%cD); \
 	 sed -e "s/%COMMITDESC%/$$COMMITDESC/" -e "s/%COMMITDATE%/$$COMMITDATE/" $< > $@