[junit4] 06/08: Simplified debian/rules

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository junit4.

commit e8d4d7680b259779c353bdb602f327912119a6ed
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 00:20:53 2017 +0200

    Simplified debian/rules
---
 debian/changelog | 1 +
 debian/rules     | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1515a32..a81dca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 junit4 (4.12-5) UNRELEASED; urgency=medium
 
   * Removed the build dependency on libmaven-enforcer-plugin-java
+  * Simplified debian/rules
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/rules b/debian/rules
index 5f7ba4d..f3efbdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --parallel --buildsystem=maven
-
-override_dh_install:
-	dh_install
-	# Run jh_manifest after dh_install to ensure that debian/junit4.manifest is
-	# really installed into the jar file. See also #808736
-	jh_manifest -pjunit4
+	dh $@ --with javahelper
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename

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