[gant] 02/03: Simplify d/rules

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository gant.

commit 69271562432f64b3ef7b44224c6bb87992accb1f
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Aug 5 10:55:39 2017 +0100

    Simplify d/rules
---
 debian/changelog | 3 ++-
 debian/rules     | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0a714f..2472688 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ gant (1.9.11-6) UNRELEASED; urgency=medium
 
   * Team upload.
   * Remove myself from uploaders list. (Closes: #XXXXXX)
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 10:53:14 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 10:55:20 +0100
 
 gant (1.9.11-5) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index c45c3fd..982002c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
 
 export JAVA_HOME = /usr/lib/jvm/default-java
-
 GROOVY_HOME      = /usr/share/groovy
-UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
 %:
 	dh $@ --buildsystem=gradle
@@ -11,8 +10,8 @@ UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)
 override_dh_install:
 	dh_install
 
-	dh_install gant/build/libs/gant-$(UPSTREAM_VERSION).jar $(GROOVY_HOME)/lib
-	dh_link $(GROOVY_HOME)/lib/gant-$(UPSTREAM_VERSION).jar /usr/share/java/gant.jar
+	dh_install gant/build/libs/gant-$(DEB_VERSION_UPSTREAM).jar $(GROOVY_HOME)/lib
+	dh_link $(GROOVY_HOME)/lib/gant-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/gant.jar
 	install -D -m755 debian/gant.sh debian/gant/$(GROOVY_HOME)/bin/gant
 	dh_link $(GROOVY_HOME)/bin/gant /usr/bin/gant
 

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