[xhtmlrenderer] 06/07: 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 xhtmlrenderer.

commit facfbd12aacab712652b570972f49ea9ad654f46
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Aug 11 21:14:18 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9f0e013..ba5320f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ xhtmlrenderer (0.0~R8+dfsg2-2) UNRELEASED; urgency=medium
   * Bump DH compat level to 10.
   * Wrap and sort dependencies lists.
   * Update Vcs-Git field.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 22:48:22 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 22:49:31 +0100
 
 xhtmlrenderer (0.0~R8+dfsg2-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index fdd786e..2e8aba4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
 
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.\+: \(.\+\)-.\+$$/\1/')
-UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/^0.0~//')
+UPSTREAM_MANGLED_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^0.0~//')
 JARS := core-renderer core-renderer-minimal
 export JAVA_HOME=/usr/lib/jvm/default-java
 
@@ -21,7 +21,7 @@ override_dh_link:
 	# provide compatibility with the versioning scheme used by upstream
 	for jar in $(JARS); do \
 		dh_link usr/share/java/$$jar.jar \
-			usr/share/java/$$jar-$(UPSTREAM_VERSION).jar; \
+			usr/share/java/$$jar-$(UPSTREAM_MANGLED_VERSION).jar; \
 	done
 
 override_jh_classpath:

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