[tools-reader-clojure] 02/04: d/rules: use version macros from dpkg

Thu Jun 29 19:31:31 UTC 2017

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to annotated tag debian/1.0.0-1
in repository tools-reader-clojure.

commit 824bbe1d543b517a6a009b0675f4bed360d50f27
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Jun 29 22:25:07 2017 +0300

    d/rules: use version macros from dpkg
    
    Use the macros provided by /usr/share/dpkg/pkg-info.mk
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1a6c2ac..b5b724d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
 include /usr/share/javahelper/java-vars.mk
+include /usr/share/dpkg/pkg-info.mk
 
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[^-]*$$//' | sed 's/~/-/')
 MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
 
 export CLASSPATH=/usr/share/java/clojure.jar
@@ -27,7 +25,7 @@ override_jh_classpath:
 	jh_classpath $(PRODUCED_JAR)
 
 override_jh_installlibs:
-	jh_installlibs --upstream-version=$(DEB_UPSTREAM_VERSION) $(PRODUCED_JAR)
+	jh_installlibs --upstream-version=$(DEB_VERSION_UPSTREAM) $(PRODUCED_JAR)
 
 override_jh_clean:
 	jh_clean
@@ -35,7 +33,7 @@ override_jh_clean:
 	rm -rf $(CURDIR)/doc
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-version $(DEB_VERSION_UPSTREAM) --force-download --rename
 
 %.html:%.md
 	@echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tools-reader-clojure.git

