[pkg-java] r11421 - trunk/libsaxon-java/debian

[Torsten Werner]

Author: twerner
Date: 2010-01-25 20:46:07 +0000 (Mon, 25 Jan 2010)
New Revision: 11421

Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/rules
Log:
Fix last fix to only use javadoc from openjdk-6. (Closes: #559966)

Modified: trunk/libsaxon-java/debian/changelog
===================================================================
--- trunk/libsaxon-java/debian/changelog	2010-01-25 20:20:09 UTC (rev 11420)
+++ trunk/libsaxon-java/debian/changelog	2010-01-25 20:46:07 UTC (rev 11421)
@@ -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 <twerner at debian.org>  Mon, 25 Jan 2010 21:44:06 +0100
+
 libsaxon-java (1:6.5.5-5.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: trunk/libsaxon-java/debian/rules
===================================================================
--- trunk/libsaxon-java/debian/rules	2010-01-25 20:20:09 UTC (rev 11420)
+++ trunk/libsaxon-java/debian/rules	2010-01-25 20:46:07 UTC (rev 11421)
@@ -15,6 +15,7 @@
 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 @@
 	# 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: