[jtharness] 03/07: Removed the dependency on javahelp2

[Emmanuel Bourg]

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

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

commit 8ec2017787ed9736e1ac01b246b3cb81e24c1e63
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 27 10:26:23 2017 +0200

    Removed the dependency on javahelp2
---
 debian/changelog | 1 +
 debian/control   | 3 +--
 debian/rules     | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 590987d..cf4df9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jtharness (5.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream relase
     - Refreshed the patches
+    - Removed the dependency on javahelp2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 Sep 2017 10:23:29 +0200
 
diff --git a/debian/control b/debian/control
index dc0b656..23cb499 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends-Indep: default-jdk,
                      default-jdk-doc,
                      ant,
                      junit4,
-                     javahelp2,
                      librxtx-java,
                      libasm3-java,
                      libservlet3.1-java
@@ -34,7 +33,7 @@ Description: General purpose test harness for Java
 Package: libjtharness-java-doc
 Section: doc
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libjtharness-java, javahelp2
+Depends: ${java:Depends}, ${misc:Depends}, libjtharness-java
 Description: JT harness (documentation)
  This is the javadoc for the libjtharness-java package.
  .
diff --git a/debian/rules b/debian/rules
index 5d4b3cf..c4419e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,13 @@ JAVA_HOME = /usr/lib/jvm/default-java
 override_dh_auto_build:
 	ant -f build/build.xml
 
-	# Remove jh.jar and javatest.jar in the tutorial...
-	rm jar-build/binaries/examples/tutorial/demots/lib/jh.jar
+	# Remove javatest.jar in the tutorial...
 	rm jar-build/binaries/examples/tutorial/demots/lib/javatest.jar
 
 override_dh_auto_install:
 	dh_auto_install
 
-	# ...and replace them with links
-	dh_link -plibjtharness-java-doc /usr/share/java/jh.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/jh.jar
+	# ...and replace it with a link
 	dh_link -plibjtharness-java-doc /usr/share/java/javatest.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/javatest.jar
 
 override_dh_compress:

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