This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libsaxon-java.
commit 034619b8efde33661f55f08c61e9db55be9262d5 Author: Torsten Werner <[email protected]> Date: Mon Jan 25 20:46:07 2010 +0000 Fix last fix to only use javadoc from openjdk-6. (Closes: #559966) --- debian/changelog | 6 ++++++ debian/rules | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c3e028..7ef691a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsaxon-java (1:6.5.5-6) unstable; urgency=low + + * Fix last fix to only use javadoc from openjdk-6. (Closes: #559966) + + -- Torsten Werner <[email protected]> Mon, 25 Jan 2010 21:44:06 +0100 + libsaxon-java (1:6.5.5-5.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/rules b/debian/rules index 91c7e40..1c4b251 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,7 @@ APIDOC=build/api JDOM=com/icl/saxon/jdom UPSTREAM_VERSION = 6.5.5 CLASSPATH = /usr/share/java/jdom1.jar +JAVADOC = /usr/lib/jvm/java-6-openjdk/bin/javadoc include /usr/share/gcj/debian_defaults ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) @@ -36,7 +37,7 @@ build-stamp: configure-stamp # split off jdom classes, everything else into saxon.jar (cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)`; \ $(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class ) - (cd $(APIDOC) ; if [ -x /usr/bin/javadoc ]; then javadoc -sourcepath ../../$(SOURCES) @../../debian/libsaxon-java-doc.javadoc; fi) + (cd $(APIDOC) ; if [ -x $(JAVADOC) ]; then $(JAVADOC) -sourcepath ../../$(SOURCES) @../../debian/libsaxon-java-doc.javadoc; fi) touch build-stamp clean: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libsaxon-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
