From 3d1b3085eba74f90a4759f54b44f267a8b7c49c5 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 19 Mar 2019 14:24:44 +0100
Subject: [ci] fix version handling in the Makefile

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 258c513..a783e44 100755
--- a/Makefile
+++ b/Makefile
@@ -112,15 +112,19 @@ build_snap:
 	mkdir -p dist
 	mv $(APPNAME)* dist/
 
+testfoo:
+	dch -v $(VERSION) -M "debian package generated from the git repository";\
+
 build_deb:  tgz
 	echo "[+] building deb..."
 	@if [ $(BUILD_RELEASE) = no ]; then\
-		echo "[!] BUILD_RELEASE=no, incrementing changelog";\
-		dch -v $(VERSION) -M "debian package generated from the git repository";\
+		dch -v $(VERSION) -M "debian package generated from the git repository" && echo "[!] BUILD_RELEASE=no, incrementing changelog";\
+	else\
+		echo "[!] BUILD_RELEASE";\
 	fi
 	mkdir -p build
-	cp dist/$(APPNAME)-$(VERSION).tgz build/$(APPNAME)_$(shell dpkg-parsechangelog -SVersion | cut -d '-' -f 1-2).orig.tar.gz
-	cd build && tar xzf $(APPNAME)_$(shell dpkg-parsechangelog -SVersion | cut -d '-' -f 1-2).orig.tar.gz
+	cp dist/$(APPNAME)-$(VERSION).tgz build/$(APPNAME)_$(shell echo ${VERSION} | cut -d '-' -f 1-2).orig.tar.gz
+	cd build && tar xzf $(APPNAME)_$(shell echo ${VERSION} | cut -d '-' -f 1-2).orig.tar.gz
 	cp -r debian/ build/$(APPNAME)-$(VERSION)/
 	cd build/$(APPNAME)-$(VERSION) && debuild -us -uc
 	cp build/$(APPNAME)_$(shell dpkg-parsechangelog -SVersion)_*.deb dist/
-- 
cgit v1.2.3