[jets3t] 04/04: 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 jets3t.

commit 590427d19c38c369a3e942738922556daefa0564
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Aug 8 20:05:16 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index db71e8f..5f68bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ jets3t (0.8.1+dfsg-4) UNRELEASED; urgency=medium
   * Remove myself from uploaders. (Closes: #XXXXXX)
   * Bump DH compat level to 10.
   * Update copyright info.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Tue, 08 Aug 2017 19:47:55 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Tue, 08 Aug 2017 19:49:09 +0100
 
 jets3t (0.8.1+dfsg-3) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index a3569b9..6dcc837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
 %:
 	dh $@ --with javahelper
 
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed 's/\+dfsg//')
-PACKAGE=jets3t
+DEB_MANGLED_VERSION_UPSTREAM = $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/\+dfsg//')
 
 override_dh_auto_build:
 	ant rebuild-all
@@ -21,9 +21,9 @@ override_dh_fixperms:
 override_dh_install:
 	dh_install
 	rm debian/jets3t/usr/share/jets3t/resources/images/nuvola/license.txt
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/poms/jets3t.pom \
-		jars/jets3t-$(DEB_UPSTREAM_VERSION).jar 
+	mh_installpoms -plib$(DEB_SOURCE)-java
+	mh_installjar -plib$(DEB_SOURCE)-java -l debian/poms/jets3t.pom \
+		jars/jets3t-$(DEB_MANGLED_VERSION_UPSTREAM).jar
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES.markdown
@@ -44,4 +44,4 @@ get-orig-source:
 get-orig-pom:
 	mkdir -p debian/poms
 	wget -O debian/poms/jets3t.pom -U NoAgent-1.0 \
-            http://repo1.maven.org/maven2/net/java/dev/jets3t/jets3t/$(DEB_UPSTREAM_VERSION)/jets3t-$(DEB_UPSTREAM_VERSION).pom
+            http://repo1.maven.org/maven2/net/java/dev/jets3t/jets3t/$(DEB_MANGLED_VERSION_UPSTREAM)/jets3t-$(DEB_MANGLED_VERSION_UPSTREAM).pom

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