[castor] 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 castor.

commit 25689091347828620b3c41a610639cd7380f6116
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Jul 24 18:38:22 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a7be363..96afe9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ castor (1.3.2-5) UNRELEASED; urgency=medium
   * Remove myself from uploaders list. (Closes: #XXXXXX).
   * Bump DH compat level to 10.
   * Update copyright information to make it 1.0 format compliant.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Mon, 24 Jul 2017 18:36:43 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 24 Jul 2017 18:37:53 +0100
 
 castor (1.3.2-4) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 781f228..4fa790d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
 export JAVA_HOME=/usr/lib/jvm/default-java
-VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
 
 %:
 	dh $@ --with javahelper
@@ -16,31 +16,31 @@ override_dh_install:
 	# XML module
 	mh_installpom -plibcastor-xml-java --no-parent xml/pom.xml
 	mh_installjar -plibcastor-xml-java -l xml/pom.xml \
-		dist/castor-xml-$(VERSION).jar
+		dist/castor-xml-$(DEB_VERSION_UPSTREAM).jar
 	# Core module
 	mh_installpom -plibcastor-core-java --no-parent core/pom.xml
 	mh_installjar -plibcastor-core-java -l core/pom.xml \
-		dist/castor-core-$(VERSION).jar
+		dist/castor-core-$(DEB_VERSION_UPSTREAM).jar
 	# JDO module
 	mh_installpom -plibcastor-jdo-java --no-parent cpa/pom.xml
 	mh_installjar -plibcastor-jdo-java -l cpa/pom.xml \
-		dist/castor-jdo-$(VERSION).jar
+		dist/castor-jdo-$(DEB_VERSION_UPSTREAM).jar
 	# Codegen module
 	mh_installpom -plibcastor-codegen-java --no-parent codegen/pom.xml
 	mh_installjar -plibcastor-codegen-java -l codegen/pom.xml \
-		dist/castor-codegen-$(VERSION).jar
+		dist/castor-codegen-$(DEB_VERSION_UPSTREAM).jar
 	# Ant tasks
 	mh_installpom -plibcastor-anttasks-java --no-parent anttask/pom.xml
 	mh_installjar -plibcastor-anttasks-java -l anttask/pom.xml \
-		dist/castor-anttasks-$(VERSION).jar
+		dist/castor-anttasks-$(DEB_VERSION_UPSTREAM).jar
 	# DDLgen module
 	mh_installpom -plibcastor-ddlgen-java --no-parent ddlgen/pom.xml
 	mh_installjar -plibcastor-ddlgen-java -l ddlgen/pom.xml \
-		dist/castor-ddlgen-$(VERSION).jar
+		dist/castor-ddlgen-$(DEB_VERSION_UPSTREAM).jar
 	# XML Schema module
 	mh_installpom -plibcastor-xml-schema-java --no-parent schema/pom.xml
 	mh_installjar -plibcastor-xml-schema-java -l schema/pom.xml \
-		dist/castor-xml-schema-$(VERSION).jar
+		dist/castor-xml-schema-$(DEB_VERSION_UPSTREAM).jar
 
 override_dh_auto_clean:
 	-cd src && ant distclean

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