[libgetopt-java] 01/11: Revert "move GetoptDemo.java away so javadoc9 doesn't crash"

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository libgetopt-java.

commit 4f4fd6afc8fc630ba3d0feb1676b1d1f04e7f5bd
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 8 21:36:22 2017 +0200

    Revert "move GetoptDemo.java away so javadoc9 doesn't crash"
    
    This reverts commit 052fddd7d441cd314ad298cb7b28e57f7eb5c376.
---
 debian/changelog |  2 --
 debian/rules     | 14 ++++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84fbd8f..953c4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ libgetopt-java (1.0.14+dfsg-4) UNRELEASED; urgency=medium
 
   * Fix build for Java 9:
     - use -source and -target 1.8
-    - move GetoptDemo.java out of the way of the build, so javadoc(1) doesn't
-      crash out about it being invalid
 
  -- Chris West (Faux) <debian at fau.xxx>  Fri, 08 Sep 2017 11:23:34 +0100
 
diff --git a/debian/rules b/debian/rules
index ba5130d..af49b70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export JAVAC=$(JAVA_HOME)/bin/javac
 export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.
 
 %:
-	dh $@ --with javahelper --with jh_maven_repo_helper --with quilt
+	dh $@ --with javahelper --with jh_maven_repo_helper
 
 override_dh_auto_build:
 	mkdir -p $(CURDIR)/classes
@@ -22,17 +22,11 @@ override_dh_auto_build:
 	cp $(CURDIR)/gnu/getopt/*.properties $(CURDIR)/classes/gnu/getopt
 	cd $(CURDIR)/classes; ${JAR} cvf ../gnu-getopt.jar gnu
 	javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/*.java
-
-override_dh_quilt_patch:
-	dh_quilt_patch
-	[ -f GetoptDemo.java  ] || mv gnu/getopt/GetoptDemo.java .
-
-override_dh_quilt_unpatch:
-	[ -f gnu/getopt/GetoptDemo.java ] || mv GetoptDemo.java gnu/getopt/
-	dh_quilt_unpatch
+	# Remove the javadoc of the example
+	[ ! -f $(CURDIR)/api/GetoptDemo.html ] || rm -f $(CURDIR)/api/GetoptDemo.html
 
 override_dh_installexamples:
-	dh_installexamples GetoptDemo.java
+	dh_installexamples gnu/getopt/GetoptDemo.java
 
 override_dh_installchangelogs:
 	dh_installchangelogs gnu/getopt/ChangeLog

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