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

[Tony Mancill]

Author: tmancill
Date: 2011-12-20 03:44:34 +0000 (Tue, 20 Dec 2011)
New Revision: 15567

Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/rules
Log:
apply patch for 651185

Modified: trunk/libsaxon-java/debian/changelog
===================================================================
--- trunk/libsaxon-java/debian/changelog	2011-12-20 00:28:31 UTC (rev 15566)
+++ trunk/libsaxon-java/debian/changelog	2011-12-20 03:44:34 UTC (rev 15567)
@@ -1,3 +1,11 @@
+libsaxon-java (1:6.5.5-8) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Apply path to ensure compatibility with OpenJDK7. (Closes: #651185)
+    - Thanks to James Page.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 19 Dec 2011 19:32:37 -0800
+
 libsaxon-java (1:6.5.5-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libsaxon-java/debian/rules
===================================================================
--- trunk/libsaxon-java/debian/rules	2011-12-20 00:28:31 UTC (rev 15566)
+++ trunk/libsaxon-java/debian/rules	2011-12-20 03:44:34 UTC (rev 15567)
@@ -12,7 +12,7 @@
 APIDOC=build/api
 JDOM=com/icl/saxon/jdom
 CLASSPATH = /usr/share/java/jdom1.jar
-JAVADOC = $(JAVA_HOME)/bin/javadoc
+JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -24,7 +24,7 @@
 
 override_dh_auto_build:
 	if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi	
-	$(JAVA_HOME)/bin/javac -nowarn -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
+	$(JAVA_HOME)/bin/javac -nowarn -source 1.5 -target 1.5 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
 	cp -r $(SOURCES)/META-INF $(BUILD)
 	cp debian/MANIFEST.MF $(BUILD)/META-INF
 	# split off jdom classes, everything else into saxon.jar