[jcsp] 07/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 jcsp.

commit c54cd3245de3fc7ae2ebf3c25af72a9bf65908dd
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Aug 7 17:41:47 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 27499b0..b83b18c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ jcsp (1.1-rc4-3) UNRELEASED; urgency=medium
   * Wrap and sort dependencies lists.
   * Update Vcs-* fields.
   * Update copyright info.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Mon, 07 Aug 2017 17:39:34 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 07 Aug 2017 17:40:54 +0100
 
 jcsp (1.1-rc4-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 127265c..6dc2648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
-
+include /usr/share/dpkg/default.mk
 export JAVA_HOME=/usr/lib/jvm/default-java
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog  | sed -n '/^Version:/s/^[^:]*: \(.*\)-.*$$/\1/p')
 
 %:
-	dh --with javahelper $@
+	dh $@ --with javahelper
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -14,7 +13,7 @@ override_dh_auto_clean:
 override_dh_install:
 	mh_installpom -plibjcsp-java debian/pom.xml
 	mh_installjar -plibjcsp-java -l debian/pom.xml dist/jcsp-*/jcsp.jar
-	jh_installlibs  --upstream-version=${UPSTREAM_VERSION} dist/jcsp-*/jcsp-core.jar
+	jh_installlibs  --upstream-version=${DEB_VERSION_UPSTREAM} dist/jcsp-*/jcsp-core.jar
 	dh_install
 
 override_dh_compress:

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