[svnkit] 02/03: 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 svnkit.

commit 35d67094a438016696f177c39a5b917e0c641034
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Aug 11 20:15:55 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a5ae8d6..a18094f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ svnkit (1.8.14-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Remove myself from uploaders list. (Closes: #XXXXXX)
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 21:06:51 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 21:14:40 +0100
 
 svnkit (1.8.14-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 572ea0c..f530701 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-
+include /usr/share/dpkg/default.mk
 export CLASSPATH=/usr/share/java/sqljet.jar:/usr/share/java/jna.jar:/usr/share/java/sequence-library.jar:/usr/share/java/trilead-ssh2.jar:/usr/share/java/svn-javahl.jar:/usr/share/java/svnkit.jar
-export UVERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.*: \(.*\)-.*$$/\1/')
 
 %:
 	dh $@ --with javahelper
@@ -20,11 +19,11 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
-	mh_installpoms -plibsvnkit-java --set-version=$(UVERSION)
-	mh_installjar  -plibsvnkit-java debian/svnkit.pom --set-version=$(UVERSION) \
-		build/lib/svnkit.jar --java-lib --usj-version=$(UVERSION)
-	mh_installjar  -plibsvnkit-java debian/svnkit-javahl16.pom --set-version=$(UVERSION) \
-		build/lib/svnkit-javahl16.jar --java-lib --usj-version=$(UVERSION)
+	mh_installpoms -plibsvnkit-java --set-version=$(DEB_VERSION_UPSTREAM)
+	mh_installjar  -plibsvnkit-java debian/svnkit.pom --set-version=$(DEB_VERSION_UPSTREAM) \
+		build/lib/svnkit.jar --java-lib --usj-version=$(DEB_VERSION_UPSTREAM)
+	mh_installjar  -plibsvnkit-java debian/svnkit-javahl16.pom --set-version=$(DEB_VERSION_UPSTREAM) \
+		build/lib/svnkit-javahl16.jar --java-lib --usj-version=$(DEB_VERSION_UPSTREAM)
 
 override_dh_auto_clean:
 	ant -f debian/build.xml clean

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