This is an automated email from the git hooks/post-receive script. faux-guest pushed a commit to branch master in repository libgetopt-java.
commit 052fddd7d441cd314ad298cb7b28e57f7eb5c376 Author: Chris West (Faux) <[email protected]> Date: Fri Sep 8 11:38:42 2017 +0100 move GetoptDemo.java away so javadoc9 doesn't crash --- debian/changelog | 2 ++ debian/rules | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 953c4cb..84fbd8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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) <[email protected]> Fri, 08 Sep 2017 11:23:34 +0100 diff --git a/debian/rules b/debian/rules index af49b70..ba5130d 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 + dh $@ --with javahelper --with jh_maven_repo_helper --with quilt override_dh_auto_build: mkdir -p $(CURDIR)/classes @@ -22,11 +22,17 @@ 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 - # Remove the javadoc of the example - [ ! -f $(CURDIR)/api/GetoptDemo.html ] || rm -f $(CURDIR)/api/GetoptDemo.html + +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 override_dh_installexamples: - dh_installexamples gnu/getopt/GetoptDemo.java + dh_installexamples 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
