[geronimo-commonj-spec] 05/06: 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 geronimo-commonj-spec.

commit 5826c9cfdb342b03fe063514ef1d59cd4fc1d1e3
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Aug 5 18:50:08 2017 +0100

    Simplify d/rules
---
 debian/changelog | 3 ++-
 debian/rules     | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3d78d6..3db5a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ geronimo-commonj-spec (1.1.1-4) UNRELEASED; urgency=medium
   * Bump DH compat level to 10.
   * Bump Standards-Version to 4.0.0. No changes were required.
   * Update copyright info.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 18:47:46 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 18:49:47 +0100
 
 geronimo-commonj-spec (1.1.1-3) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index f9a7f75..2eb2ebf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,17 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-UVERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.*: \(.*\)-\(.*\)$$/\1/')
 
 %:
 	dh $@ --with javahelper
 
 override_jh_installlibs:
-	mh_installpom -plibgeronimo-commonj-spec-java --no-parent --set-version=$(UVERSION) pom.xml
-	mh_installjar -plibgeronimo-commonj-spec-java --set-version=$(UVERSION) --java-lib pom.xml geronimo-commonj-spec.jar
+	mh_installpom -plibgeronimo-commonj-spec-java --no-parent \
+		--set-version=$(DEB_VERSION_UPSTREAM) pom.xml
+	mh_installjar -plibgeronimo-commonj-spec-java \
+		--set-version=$(DEB_VERSION_UPSTREAM) \
+		--java-lib pom.xml geronimo-commonj-spec.jar
 
 override_dh_clean:
 	dh_clean

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