[ganymed-ssh2] 04/08: 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 ganymed-ssh2.

commit 8b5ff62f196fd2db68ba3e7855e57b2ab92fe3d5
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Aug 5 11:43:27 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 98b0ecf..dc0404c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ ganymed-ssh2 (250-3) UNRELEASED; urgency=medium
   * Add missing call to mh_clean in clean target.
   * Move package maintenance to Git.
   * Remove myself from uploaders list. (Closes: #XXXXXX).
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 11:41:25 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 05 Aug 2017 11:43:01 +0100
 
 ganymed-ssh2 (250-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 6d01f83..c503c79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,13 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
 
-PKGNAME := ganymed-ssh2
-LIBNAME := lib$(PKGNAME)-java
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
+LIBNAME := lib$(DEB_SOURCE)-java
 
 %:
-	dh --with javahelper $@
+	dh $@ --with=javahelper
 
 override_dh_auto_build:
-	jh_build $(PKGNAME).jar src
+	jh_build $(DEB_SOURCE).jar src
 
 override_dh_auto_clean:
 	jh_clean
@@ -19,7 +17,7 @@ override_dh_auto_install:
 	dh_auto_install
 	mh_installpom -p$(LIBNAME) $(CURDIR)/debian/pom.xml
 	mh_installjar -p$(LIBNAME) -l $(CURDIR)/debian/pom.xml \
-		$(CURDIR)/$(PKGNAME).jar
+		$(CURDIR)/$(DEB_SOURCE).jar
 
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.txt
@@ -30,4 +28,4 @@ get-orig-source:
 		--no-symlink \
 		--force-download \
 		--destdir $(CURDIR)
-	mv $(PKGNAME)-build$(VERSION).tar.gz $(PKGNAME)_$(VERSION).orig.tar.gz
+	mv $(DEB_SOURCE)-build$(DEB_VERSION_UPSTREAM).tar.gz $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz

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